From 2b610eab0d3f304ee203932b61d0071d8719063b Mon Sep 17 00:00:00 2001 From: Yaroslavik Date: Sun, 16 Jun 2019 09:22:59 +0200 Subject: [PATCH 01/14] Update ru_ru.lang (#31) ru_ru lang file updated (yaroslav4167). --- .../assets/engineersdecor/lang/ru_ru.lang | 158 +++++++++--------- 1 file changed, 80 insertions(+), 78 deletions(-) diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 56747df..2f951db 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -14,8 +14,8 @@ engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Помощь§6]§r #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.clinker_brick_block.name=Клинкерный кирпич tile.engineersdecor.clinker_brick_block.help=§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. -tile.engineersdecor.clinker_brick_stained_block.name=Stained Clinker Brick Block -#tile.engineersdecor.clinker_brick_stained_block.help=§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block. Has more visible traces of grime or stain. +tile.engineersdecor.clinker_brick_stained_block.name=Грязный клинкерный кирпич +tile.engineersdecor.clinker_brick_stained_block.help=§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. Имеет более заметные следы грязи или пятен. tile.engineersdecor.slag_brick_block.name=Шлакоблок tile.engineersdecor.slag_brick_block.help=§6Серо-коричневый кирпичный блок с зависимыми от положения вариациями текстуры. tile.engineersdecor.rebar_concrete.name=Железобетон @@ -43,8 +43,8 @@ tile.engineersdecor.treated_wood_ladder.help=§6Погодоустойчивая #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.clinker_brick_stairs.name=Клинкерная кирпичная лестница tile.engineersdecor.clinker_brick_stairs.help=§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок -tile.engineersdecor.clinker_brick_stained_stairs.name=Stained Clinker Brick Stairs -#tile.engineersdecor.clinker_brick_stained_stairs.help=§6Looks slightly darker and more color intensive than the vanilla brick block. Has more visible traces of grime or stain. +tile.engineersdecor.clinker_brick_stained_stairs.name=Грязная кирпичная лестница +tile.engineersdecor.clinker_brick_stained_stairs.help=§6Выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. Имеет более заметные следы грязи или пятен. tile.engineersdecor.slag_brick_stairs.name=Клинкерная кирпичная лестница tile.engineersdecor.slag_brick_stairs.help=§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. tile.engineersdecor.rebar_concrete_stairs.name=Железобетонная лестница @@ -57,19 +57,19 @@ tile.engineersdecor.treated_wood_pole.help=§6Надёжный столб с д Может быть полезен в качестве альтернативы электро-столбам, если требуется особая специальная длина, \ или как опора для конструкций. tile.engineersdecor.treated_wood_pole_head.name=Прямой обработанный деревянный столб верхняя часть/основание -#tile.engineersdecor.treated_wood_pole_head.help=§6Wooden part fitting as foot or head of straight poles. +tile.engineersdecor.treated_wood_pole_head.help=§6Деревянная часть, подходит как основание или наконечник прямых столбов. tile.engineersdecor.treated_wood_pole_support.name=Прямой обработанный деревянный столб -#tile.engineersdecor.treated_wood_pole_support.help=§6Heavy duty wooden support part fitting as foot or head of straight poles. -tile.engineersdecor.thick_steel_pole.name=Straight thick steel pole -#tile.engineersdecor.thick_steel_pole.help=§6Straight hollow pole fragment (6x6x16) for structural support purposes. -tile.engineersdecor.thin_steel_pole.name=Straight thin steel pole -#tile.engineersdecor.thin_steel_pole.help=§6Straight hollow pole fragment (4x4x16) for structural support purposes. -tile.engineersdecor.thin_steel_pole_head.name=Straight thin steel pole head/foot -#tile.engineersdecor.thin_steel_pole_head.help=§6Steel part fitting as foot or head of the thin steel pole (4x4x16). -tile.engineersdecor.thick_steel_pole_head.name=Straight thick steel pole head/foot -#tile.engineersdecor.thick_steel_pole_head.help=§6Steel part fitting as foot or head of the thick steel pole (6x6x16). -tile.engineersdecor.steel_double_t_support.name=Steel double T support -#tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support bream fragment. +tile.engineersdecor.treated_wood_pole_support.help=§6Усиленная деревянная опорная часть, подходит как основание или наконечник прямых столбов. +tile.engineersdecor.thick_steel_pole.name=Прямой толстый стальной столб +tile.engineersdecor.thick_steel_pole.help=§6Фрагмент прямого полого столба (6x6x16) для поддержки конструкции. +tile.engineersdecor.thin_steel_pole.name=Прямой тонкий стальной столб +tile.engineersdecor.thin_steel_pole.help=§6Фрагмент прямого полого столба (4x4x16) для поддержки конструкции. +tile.engineersdecor.thin_steel_pole_head.name=Прямое тонкое стальное основание/наконечник столбов +tile.engineersdecor.thin_steel_pole_head.help=§6Стальная часть, подходящая как основание или наконечник тонкого стального столба (4x4x16). +tile.engineersdecor.thick_steel_pole_head.name=Прямое толстое стальное основание/наконечник столбов +tile.engineersdecor.thick_steel_pole_head.help=§6Стальная часть, подходящая как основание или наконечник тонкого стального столба (4x4x16). +tile.engineersdecor.steel_double_t_support.name=Стальная двойная Т-образная опора +tile.engineersdecor.steel_double_t_support.help=§6Фрагмент горизонтальной потолочной опорной балки. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Стол из обработанного дерева tile.engineersdecor.treated_wood_table.help=§6Прочный деревянный стол с четырьмя ножками .§r Для использования в помещении и на улице. @@ -86,75 +86,77 @@ tile.engineersdecor.treated_wood_window.help=§6Деревянный карка tile.engineersdecor.treated_wood_windowsill.name=Обработанный деревянный подоконник tile.engineersdecor.treated_wood_windowsill.help=§6Простое оформление окон. tile.engineersdecor.steel_framed_window.name=Окно со стальной рамой -#tile.engineersdecor.steel_framed_window.help=§6Steel framed triple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes. +tile.engineersdecor.steel_framed_window.help=§6Стальной каркас окна с тройным остеклением. Хорошо изолирует. §r Не подключается к смежным блокам, таким как стеклянные панели. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. -tile.engineersdecor.small_electrical_furnace.name=Small electrical furnace -#tile.engineersdecor.small_electrical_furnace.help=§6Small metal cased pass-through furnace.§r \ - Automatically draws items from the input side and puts items into the inventory at the output side. \ - Items can be inserted or drawn from all sides using hoppers. Implicitly bypasses items that cannot be \ - smelted or cooked to the output. Slightly more energy efficient and faster than a heated cobblestone \ - furnace. Fifos and feeders transfer whole stacks. Feeders require a bit of power. -tile.engineersdecor.small_waste_incinerator.name=Small waste incinerator -#tile.engineersdecor.small_waste_incinerator.help=§6Trash with internal fifo slots.§r Items can be inserted on all sides, and are kept until \ - there is no space left in the fifo. After that the oldest stack will be incinerated. Apply \ - electrical RF/FE power to increase the processing speed. Keeps its inventory when being \ - relocated. +tile.engineersdecor.small_electrical_furnace.name=Компактная конвейерная электрическая печь +tile.engineersdecor.small_electrical_furnace.help=§6Компактная конвейерная печь в металлическом корпусе.§r \ + Автоматически принимает предметы со стороны ввода и складывает в инвентарь со стороны вывода. \ + Предметы могут быть импортированы/вытянуты со всех сторон с помощью воронок. Без проблем пропускает \ + элементы, которые нельзя выплавить или приготовить. Чуть более энергоэффективная и быстра, \ + чем утеплённая булыжная печь. Транспортировка работает стеками. Механизм требует немного энергии. +tile.engineersdecor.small_waste_incinerator.name=Компактный сжигатель отходов +tile.engineersdecor.small_waste_incinerator.help=§6Отходы с слотами очереди.§r Предметы могут помещаться с любой стороны, и храниться \ + до тех пор, пока в очереди не останется свободного места. После этого самый старый стэк \ + будет сожжен. Подключите электричество (RF/FE) для увеличения скорости обработки. \ + Сохраняет инвентарь при перемещении. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.straight_pipe_valve.name=Straight fluid valve -#tile.engineersdecor.straight_pipe_valve.help=§6Straight fluid pipe fragment.§r Conducts fluids only in one direction. \ - Does not connect to the sides. Reduces flow rate. Sneak to place in reverse direction. -tile.engineersdecor.straight_pipe_valve_redstone.name=Redstone controlled fluid valve -#tile.engineersdecor.straight_pipe_valve_redstone.help=§6Straight fluid pipe fragment.§r Conducts fluids only in one direction. \ - Does not connect to the sides. Sneak to place in reverse direction. \ - Blocks if not redstone powered. -tile.engineersdecor.straight_pipe_valve_redstone_analog.name=Redstone analog fluid valve -#tile.engineersdecor.straight_pipe_valve_redstone_analog.help=§6Straight fluid pipe fragment.§r Conducts fluids only in one direction. \ - Does not connect to the sides. Sneak to place in reverse direction. \ - Blocks if not redstone powered, reduces the flow rate linear from power 1 to 14, \ - opens to maximum possible valve flow rate for power 15. -tile.engineersdecor.passive_fluid_accumulator.name=Passive fluid accumulator -#tile.engineersdecor.passive_fluid_accumulator.help=§6Vacuum suction based fluid collector.§r Has one output, all other sides are input. \ - Drains fluids from adjacent tanks when being drained from the output port by a pump. +tile.engineersdecor.straight_pipe_valve.name=Жидкостный одноканальный клапан +tile.engineersdecor.straight_pipe_valve.help=§6Фрагмент прямой трубы.§r проводит жидкость только в одном направлении. \ + Не соединяется по бокам. Уменьшает пропускную способность. \ + SHIFT для размещения в противоположном направлении. +tile.engineersdecor.straight_pipe_valve_redstone.name=Редстоун-контролируемый жидкостный клапан +tile.engineersdecor.straight_pipe_valve_redstone.help=§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. \ + Не соединяется по бокам. SHIFT - чтобы разместить в обратном направлении. \ + Блокирует поток, если присутствует сигнал красного камня. +tile.engineersdecor.straight_pipe_valve_redstone_analog.name=Редстоун-аналоговый клапан для жидкости +tile.engineersdecor.straight_pipe_valve_redstone_analog.help=§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. \ + Не соединяется по бокам. SHIFT - чтобы разместить в обратном направлении. \ + Не пропускает при отсутствии красного сигнала, уменьшает расход линейно с мощности 1 до 14, \ + открывается максимально-возможно при уровне красного сигнала 15. +tile.engineersdecor.passive_fluid_accumulator.name=Пассивный жидкостный накопитель +tile.engineersdecor.passive_fluid_accumulator.help=§6Вакуумный всасывающий жидкостный коллектор§r Имеет один выход, все остальные стороны - входные. \ + Сливает жидкости из соседних резервуаров при выкачивании жидкости из выходного порта. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.factory_dropper.name=Factory dropper -#tile.engineersdecor.factory_dropper.help=§6Dropper suitable for advanced factory automation.§r Has twelve round-robin selected slots. \ - Drop force, angle, stack size, and cool-down delay adjustable in the GUI. Three stack compare \ - slots with logical AND or OR can be used as internal trigger source. Internal trigger can be \ - AND'ed or OR'ed with the external redstone signal trigger. Trigger simulation buttons for testing. \ - Pre-opens shutter door when internal trigger conditions are met. Drops all matching stacks \ - simultaneously. Click on all elements in the GUI to see how it works. +tile.engineersdecor.factory_dropper.name=Фабричный выбрасыватель +tile.engineersdecor.factory_dropper.help=§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет двенадцать выборочных слотов. \ + Сила броска, угол, размер стопки и задержка настраиваются в GUI. Три слота сравнения стека \ + с логическим И или ИЛИ могут использоваться в качестве внутреннего источника запуска. \ + Внутренний триггер может быть И или ИЛИ с внешним триггерным сигналом красного камня. \ + Триггерные кнопки симуляции для тестирования. Предварительно открывает дверцу затвора, \ + когда выполняются условия внутреннего запуска. Сбрасывает все соответствующие стеки одновременно. \ + Нажмите на все элементы в GUI, чтобы увидеть, как это работает. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.sign_decor.name=Sign plate (Engineer's decor logo) -#tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots. -tile.engineersdecor.sign_hotwire.name=Sign "Caution hot wire" -#tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit. -tile.engineersdecor.sign_mindstep.name=Sign "Mind the step" -#tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally). -tile.engineersdecor.sign_danger.name=Sign "Caution really dangerous there" -#tile.engineersdecor.sign_danger.help=§6General danger warning. -tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead" -#tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps. -tile.engineersdecor.sign_factoryarea.name=Sign "Factory Area" -#tile.engineersdecor.sign_factoryarea.help=§6Marker sign for buildings or areas where the really big machines are. +tile.engineersdecor.sign_decor.name=Табличка с надписью (Логотип Engineer's decor) +tile.engineersdecor.sign_decor.help=§Это не должно быть крафтовым или видимым в JEI. Используется для творческой вкладки и скриншотов. +tile.engineersdecor.sign_hotwire.name=Знак «Осторожно, под напряжением» +tile.engineersdecor.sign_hotwire.help=§6Предупреждение об опасности поражения электрическим током. Не забудьте разместить вокруг HV, иначе у вас будет штраф при следующей проверке. +tile.engineersdecor.sign_mindstep.name=Знак «Осторожно, там ступеньки!» +tile.engineersdecor.sign_mindstep.help=§6Размещается на стенах (горизонтально) +tile.engineersdecor.sign_danger.name=Знак «Осторожно, там опасность» +tile.engineersdecor.sign_danger.help=§6Общее предупреждение об опасности. +tile.engineersdecor.sign_defense.name=Знак «Осторожно, впереди система обороны» +tile.engineersdecor.sign_defense.help=§6Предупреждающий знак для турелей, катушек Тесла и ловушек. +tile.engineersdecor.sign_factoryarea.name=Знак «Заводская зона» +tile.engineersdecor.sign_factoryarea.help=§6Знак для зданий или областей, где находятся действительно большие машины. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.halfslab_rebar_concrete.name=Rebar Concrete Slice -#tile.engineersdecor.halfslab_rebar_concrete.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_concrete.name=Concrete Slice -#tile.engineersdecor.halfslab_concrete.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_treated_wood.name=Treated Wood Slice -#tile.engineersdecor.halfslab_treated_wood.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_iron.name=Iron Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_iron.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_steel.name=Steel Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_steel.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_copper.name=Copper Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_copper.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +tile.engineersdecor.halfslab_rebar_concrete.name=Арматура для бетона +tile.engineersdecor.halfslab_rebar_concrete.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_concrete.name=Бетонный срез +tile.engineersdecor.halfslab_concrete.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_treated_wood.name=Часть обработанного дерева +tile.engineersdecor.halfslab_treated_wood.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_sheetmetal_iron.name=Часть железного листового металла +tile.engineersdecor.halfslab_sheetmetal_iron.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_sheetmetal_steel.name=Часть стального листового металла +tile.engineersdecor.halfslab_sheetmetal_steel.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_sheetmetal_copper.name=Часть медного листового металла +tile.engineersdecor.halfslab_sheetmetal_copper.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_sheetmetal_gold.name=Часть золотого листового металла +tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. +tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Часть алюминиевого листового металла +tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- From fc785fd77ff9d05cefbc370dff819fcc4348b426 Mon Sep 17 00:00:00 2001 From: stfwi Date: Sun, 16 Jun 2019 09:44:51 +0200 Subject: [PATCH 02/14] Release notes updated, version data updated, meta data updated, merge fixed. --- 1.12/gradle.properties | 2 +- 1.12/readme.md | 2 ++ .../assets/engineersdecor/lang/ru_ru.lang | 19 ------------------- 1.13/readme.md | 4 +++- meta/update.json | 3 ++- 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 1a40bc4..ee11ec5 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.8 +version_engineersdecor=1.0.9-b1 diff --git a/1.12/readme.md b/1.12/readme.md index a7dd1d6..25e52fd 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + ~ v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). + ------------------------------------------------------------------- - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 6e9edf2..2f951db 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -141,24 +141,6 @@ tile.engineersdecor.sign_defense.help=§6Предупреждающий знак tile.engineersdecor.sign_factoryarea.name=Знак «Заводская зона» tile.engineersdecor.sign_factoryarea.help=§6Знак для зданий или областей, где находятся действительно большие машины. #----------------------------------------------------------------------------------------------------------- -<<<<<<< HEAD -tile.engineersdecor.halfslab_rebar_concrete.name=Rebar Concrete Slice -#tile.engineersdecor.halfslab_rebar_concrete.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_concrete.name=Concrete Slice -#tile.engineersdecor.halfslab_concrete.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_treated_wood.name=Treated Wood Slice -#tile.engineersdecor.halfslab_treated_wood.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_iron.name=Iron Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_iron.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_steel.name=Steel Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_steel.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_copper.name=Copper Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_copper.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -======= tile.engineersdecor.halfslab_rebar_concrete.name=Арматура для бетона tile.engineersdecor.halfslab_rebar_concrete.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. tile.engineersdecor.halfslab_concrete.name=Бетонный срез @@ -175,7 +157,6 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Часть золотого л tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Часть алюминиевого листового металла tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. ->>>>>>> 2b610eab0d3f304ee203932b61d0071d8719063b #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.13/readme.md b/1.13/readme.md index 75a3ac8..a1c6669 100644 --- a/1.13/readme.md +++ b/1.13/readme.md @@ -10,7 +10,9 @@ Mod sources for Minecraft version 1.13.2. ---- ## Revision history - ~ v1.0.7-b4 [A] + ~ v1.0.7-b5 [A] + + - v1.0.7-b4 [A] Added stained clinker brick block/stairs. - v1.0.7-b3 [V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned. diff --git a/meta/update.json b/meta/update.json index 9b4248b..501f647 100644 --- a/meta/update.json +++ b/meta/update.json @@ -43,6 +43,7 @@ "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table." }, "1.13.2": { + "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", @@ -59,6 +60,6 @@ "1.12.2-recommended": "1.0.8", "1.12.2-latest": "1.0.8", "1.13.2-recommended": "", - "1.13.2-latest": "1.0.7-b3" + "1.13.2-latest": "1.0.7-b4" } } \ No newline at end of file From 8af8544e30b5c5f7fa81d2452f97752f6914d6e6 Mon Sep 17 00:00:00 2001 From: xuyu0v0 Date: Wed, 19 Jun 2019 12:13:26 -0400 Subject: [PATCH 03/14] Create zh_cn.json (#33) 1.13: Added ch_cn translation (PR#33 by XuyuEre). --- .../assets/engineersdecor/lang/zh_cn.json | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json diff --git a/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json new file mode 100644 index 0000000..08710a4 --- /dev/null +++ b/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json @@ -0,0 +1,53 @@ +{ + "language": "Chinese", + "language.region": "China", + "language.code": "zh_cn", + + "itemGroup.tabengineersdecor":"工程师的装饰", + + "engineersdecor.config.title":"工程师的装饰配置", + "engineersdecor.tooltip.hint.extended":"§6[按§9SHIFT§r获取更多信息§6]§r", + "engineersdecor.tooltip.hint.help":"§6[按§9CTRL-SHIFT§r获取帮助§6]§r", + + "block.engineersdecor.clinker_brick_block":"熟料砖", + "block.engineersdecor.clinker_brick_block.help":"§6具有位置相关纹理变化的砖块.§r\n看起来比原版砖块稍暗,颜色更浓.", + "block.engineersdecor.clinker_brick_stairs":"熟料砖楼梯", + "block.engineersdecor.clinker_brick_stairs.help":"§6看起来比原版砖块稍暗,颜色更浓.", + + "block.engineersdecor.slag_brick_block":"炉渣砖", + "block.engineersdecor.slag_brick_block.help":"§6灰褐色砖块,具有位置相关的纹理变化.", + "block.engineersdecor.slag_brick_stairs":"炉渣砖楼梯", + "block.engineersdecor.slag_brick_stairs.help":"§6灰褐色砖块楼梯.", + + "block.engineersdecor.rebar_concrete":"钢筋混凝土", + "block.engineersdecor.rebar_concrete.help":"§6钢筋混凝土砌块.§r 昂贵,但像黑曜石一样防苦力怕.", + "block.engineersdecor.rebar_concrete_stairs":"钢筋混凝土楼梯", + "block.engineersdecor.rebar_concrete_stairs.help":"§6钢筋混凝土楼梯.§r 昂贵,但像黑曜石一样防苦力怕.", + "block.engineersdecor.rebar_concrete_wall":"钢筋混凝土墙", + "block.engineersdecor.rebar_concrete_wall.help":"§6钢筋混凝土墙.§r 昂贵,但像黑曜石一样防苦力怕.", + + "block.engineersdecor.concrete_wall":"水泥墙", + "block.engineersdecor.concrete_wall.help":"§6墙由坚固的混凝土制成.", + + "block.engineersdecor.metal_rung_ladder":"金属环梯", + "block.engineersdecor.metal_rung_ladder.help":"§6典型的工业墙梯,包括水平金属杆横档.", + + "block.engineersdecor.metal_rung_steps":"交错的金属台阶", + "block.engineersdecor.metal_rung_steps.help":"§6贴在墙上的交错的杆横档,允许爬上,爬下等等.", + + "block.engineersdecor.treated_wood_ladder":"经过处理的木梯", + "block.engineersdecor.treated_wood_ladder.help":"§6防风雨的木梯.", + + + + + "block.engineersdecor.iron_sheet_roof":"铁板金属屋顶", + "block.engineersdecor.iron_sheet_roof.help":"§6嗯,这是一个屋顶.", + + "block.engineersdecor.treated_wood_pole":"直立处理木杆", + "block.engineersdecor.treated_wood_pole.help":"§6具有导线继电器直径的直极片段.§r\n如果需要特殊的特殊长度,或作为结构的支撑,可以作为线柱的替代品.", + + "block.engineersdecor.treated_wood_table":"经过处理的木桌", + "block.engineersdecor.treated_wood_table.help":"§6坚固的四足木桌." + +} From 0a310c426126e1b7ea97cead70fbcbd7af729303 Mon Sep 17 00:00:00 2001 From: stfwi Date: Sat, 22 Jun 2019 22:53:51 +0200 Subject: [PATCH 04/14] Block hardness adaptions (issue #32). Lang files updated. Build utils enhanced to prepare code release for 1.13/1.14. --- 1.12/Makefile | 15 +- 1.12/build.gradle | 5 + 1.12/meta/update.json | 3 +- 1.12/readme.md | 5 +- .../wile/engineersdecor/blocks/ModBlocks.java | 40 +- .../assets/engineersdecor/lang/zh_cn.lang | 165 ++++++++ .../ie_stone_decoration_concrete.png | Bin 0 -> 1104 bytes 1.12/tasks.js | 350 +--------------- 1.13/readme.md | 5 +- 1.13/tasks.js | 230 +---------- Makefile | 43 +- meta/lib/constants.js | 19 + meta/lib/libassets.js | 127 ++++++ meta/lib/liblang.1.12.js | 205 ++++++++++ meta/lib/liblang.1.13.js | 122 ++++++ meta/lib/libtask.js | 383 ++++++++++++++++++ meta/update.json | 13 +- readme.md | 8 +- tasks.js | 101 ++++- 19 files changed, 1221 insertions(+), 618 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/ieoriginal/ie_stone_decoration_concrete.png create mode 100644 meta/lib/constants.js create mode 100644 meta/lib/libassets.js create mode 100644 meta/lib/liblang.1.12.js create mode 100644 meta/lib/liblang.1.13.js create mode 100644 meta/lib/libtask.js diff --git a/1.12/Makefile b/1.12/Makefile index 4a2d37b..f74e1e4 100644 --- a/1.12/Makefile +++ b/1.12/Makefile @@ -28,7 +28,7 @@ wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst # # Targets # -.PHONY: default mod init clean clean-all all run install sanatize dist-check dist start-server +.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server port-languages default: mod @@ -46,8 +46,17 @@ clean: clean-all: clean @echo "[1.12] Cleaning using gradle ..." @rm -f dist/* + @rm -rf run/logs/ + @rm -rf run/crash-reports/ @$(GRADLE) clean cleanCache +mrproper: clean-all + @rm -rf meta/* + @rm -rf run/ + @rm -rf out/ + @rm -f .project + @rm -f .classpath + init: @echo "[1.12] Initialising eclipse workspace using gradle ..." @$(GRADLE) setupDecompWorkspace @@ -90,3 +99,7 @@ dist: sanatize dist-check clean-all mod @mkdir -p dist @cp build/libs/$(MOD_JAR_PREFIX)* dist/ @djs tasks.js dist + +port-languages: + @echo "[1.12] Porting language files to 1.13/1.14 ..." + @djs tasks.js port-languages diff --git a/1.12/build.gradle b/1.12/build.gradle index 0cb3819..e3ed998 100644 --- a/1.12/build.gradle +++ b/1.12/build.gradle @@ -24,6 +24,11 @@ archivesBaseName = "engineersdecor-${version_minecraft}" def signing = { -> def sp = new Properties() + sp.keystore_file = project.keystore_file + sp.keystore_alias = project.keystore_alias + sp.keystore_pass = project.keystore_pass + sp.keystore_keypass = project.keystore_keypass + sp.fingerprint_sha1 = project.fingerprint_sha1 if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } return sp }() diff --git a/1.12/meta/update.json b/1.12/meta/update.json index ba18c8f..3658e35 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", "1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", "1.0.8-b2": "[F] Config opt-out fixed (thx IronPiston for the report #30).\n[A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching).", "1.0.8-b1": "[A] Added \"Factory area\" sign.\n[M] Electrical furnace recipe changed (hoppers to conveyors).\n[A] Opt-out config options added.\n[F] Lang file fixes for en_us (Angela, PR#29).", @@ -44,6 +45,6 @@ }, "promos": { "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.8" + "1.12.2-latest": "1.0.9-b1" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 25e52fd..9272019 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -8,9 +8,10 @@ Mod sources for Minecraft version 1.12.2. - Compiled mod distribution channel is curseforge: https://www.curseforge.com/minecraft/mc-mods/engineers-decor/files. ---- -## Revision history +## Version history - ~ v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). + - v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). + [M] Block hardness adaptions (issue #32). ------------------------------------------------------------------- - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index ff8fe25..3b6a90b 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -90,28 +90,28 @@ public class ModBlocks public static final BlockDecorStraightPole THIN_STEEL_POLE = new BlockDecorStraightPole( "thin_steel_pole", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT, - Material.IRON, 1.0f, 15f, SoundType.METAL, + Material.IRON, 2.0f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(6,6,0, 10,10,16) ); public static final BlockDecorStraightPole THIN_STEEL_POLE_HEAD = new BlockDecorStraightPole( "thin_steel_pole_head", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_IF_SAME, - Material.IRON, 1.0f, 15f, SoundType.METAL, + Material.IRON, 2.0f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(6,6,0, 10,10,16) ); public static final BlockDecorStraightPole THICK_STEEL_POLE = new BlockDecorStraightPole( "thick_steel_pole", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT, - Material.IRON, 1.0f, 15f, SoundType.METAL, + Material.IRON, 2.0f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(5,5,0, 11,11,16) ); public static final BlockDecorStraightPole THICK_STEEL_POLE_HEAD = new BlockDecorStraightPole( "thick_steel_pole_head", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_IF_SAME, - Material.IRON, 1.0f, 15f, SoundType.METAL, + Material.IRON, 2.0f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(5,5,0, 11,11,16) ); @@ -139,7 +139,7 @@ public class ModBlocks public static final BlockDecorDirected INSET_LIGHT_IRON = new BlockDecorDirected( "iron_inset_light", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(14<NSs56Z83KGlT(gp*bCP3nQ)2T{eHB&^8dg0`Rgm+t&;o180KilUvYPH;IDZ8l{>#Q z=8GqFuo%ULWrxpvQm}PSpVHLori8ki61xk2r_J`9x+^oOs`$pd1w}2pzlfi@^;pAD z>ei;rt4r6MxjgY*o4@2u*{wpaUnR$`*rzh5_l~}+$Ii8>;eoqE6SSR`+T9bQ?j{)i zeSN?ulg0M^jUDnrd#!Z0%oTfY_0#qIhkG;R`|iKLDH-%wzFUtcpU3=+8z`=0}).length) fails.push("No tag version not found matching the gradle properties version."); - if(git_remote.replace(/[\s]/g,"").indexOf("git@github.com:stfwi/engineers-decor.git(push)") < 0) fails.push("Not the reference repository."); - if((git_branch != "develop") && (git_branch != "master")) { - fails.push("No valid branch for dist. (branch:'"+git_branch+"')"); - } else if((git_branch == "develop") && (version_engineersdecor.replace(/[^ab]/g,"")=="")) { - fails.push("Cannot make release dist on develop branch."); - } else if((git_branch == "master") && (version_engineersdecor.replace(/[^ab]/g,"")!="")) { - fails.push("Cannot make beta dist on master branch."); - } - if(git_diff !== "") fails.push("Not everything committed to the GIT repository."); - if((!fs.isfile("signing.jks")) || (!fs.isfile("signing.properties"))) fails.push("Jar signing files missing."); - if(fails.length>0) { - for(var i in fails) fails[i] = " - " + fails[i]; - alert("Dist check failed"); - alert(fails.join("\n")+"\n"); - exit(1); - } -}; - tasks["sync-languages"] = function() { - function load() { - var lang_data = {}; - fs.find("./src/main/resources/assets/engineersdecor/lang", '*.lang', function(f){ - var lang_code = fs.basename(f).replace(/\..*$/,"").trim().toLowerCase(); - var lines = fs.readfile(f).trim().split("\n"); - var was_eol_escape = false; - for(var i in lines) { - if(was_eol_escape) { - var k=0; - for(k=i-1; k>=0; --k) { - if(lines[k] != null) { - lines[k] += "\n" + lines[i]; - break; - } - } - was_eol_escape = lines[i].match(/[^\\][\\]$/) != null; - lines[i] = null; - } else { - lines[i] = lines[i].trim(); - was_eol_escape = lines[i].match(/[^\\][\\]$/) != null; - } - } - lang_data[lang_code] = lines.filter(function(l){return (l!==null);}); - return false; - }); - return lang_data; - } - function reference_content(lang_data, reflang_code) { - var lang_lines = []; - for(var i in lang_data[reflang_code]) { - var txt = lang_data[reflang_code][i].trim(); - if((txt.search(/^#/)>=0) || (txt.search("=")<0)) { lang_lines.push(txt); continue; }; // comment "#" or empty line in the ref lang file - var kv = txt.split("=", 2); - var key = kv[0].trim(); - var val = kv[1].trim(); - var o = {key:key, tr:{}}; - o.tr[reflang_code] = val; - lang_lines.push(o); - } - delete lang_data[reflang_code]; - return lang_lines; - } - function add_language(lang_lines, lang_name, lang_data) { - const find_line = function(lines, key) { - for(var i in lines) { - if((typeof(lines[i]) !== "object")) continue; - if(lines[i].key.toLowerCase()==key.toLowerCase()) return i; - } - return -1; - }; - for(var i in lang_data) { - var txt = lang_data[i].trim(); - if(txt.search(/^#/)>=0) continue; - if(txt.search("=")<0) continue; - var kv = txt.split("=", 2); - var key = kv[0].trim(); - var val = kv[1].trim(); - var line_i = find_line(lang_lines, key); - if(line_i >= 0) { - lang_data[i] = undefined; - lang_lines[line_i].tr[lang_name] = val; - } - } - return lang_data; - } - - function complete_lang_lines(lang_lines, lang_names, reflang_code) { - var lang_outputs = {}; - for(var i in lang_names) lang_outputs[lang_names[i]] = []; - for(var i_line in lang_lines) { - var entry = lang_lines[i_line]; - if(typeof(entry) !== "object") { - for(var i in lang_names) lang_outputs[lang_names[i]].push(entry); - } else { - for(var i in lang_names) { - var name = lang_names[i]; - if(entry.tr[name] !== undefined) { - lang_outputs[name].push(entry.key + "=" + entry.tr[name]); - } else { - var added = entry.key + "=" + entry.tr[reflang_code]; - if((entry.key.search(/\.tip$/)>0) || (entry.key.search(/\.help$/)>0)) added = "#" + added; - lang_outputs[name].push(added); - if(added.search(/^#/)<0) print("[warn] Lang: Added default language for missing entry in " + name + ": '" + added + "'"); - } - } - } - } - return lang_outputs; - } - - const reflang_code = "en_us"; - var lang_data = load(); - var lang_names = Object.keys(lang_data); - var lang_lines = reference_content(lang_data, reflang_code); - for(var lang_name in lang_data) { - lang_data[lang_name] = add_language(lang_lines, lang_name, lang_data[lang_name]); - lang_data[lang_name] = lang_data[lang_name].filter(function(l){ return !!l; }); - if(lang_data[lang_name].length == 0) delete lang_data[lang_name]; - } - var output_data = complete_lang_lines(lang_lines, lang_names, reflang_code); - for(var i in output_data) output_data[i] = output_data[i].join("\n") + "\n\n"; - - // Remaining lines in lang files (not in the reference lang file) - for(var lang_name in lang_data) { - for(var i in lang_data[lang_name]) { - if(lang_data[lang_name][i].search(/^#/)<0) { - var added = "# " + lang_data[lang_name][i].replace(/^[#\s]+/,""); - output_data[lang_name] += added + "\n"; - print("[warn] Lang: Commented out unknown key in " + lang_name + ": '" + added + "'"); - } - } - } - for(var name in output_data) output_data[name] = output_data[name].trim() + "\n"; - - for(var name in output_data) { - fs.writefile("./src/main/resources/assets/engineersdecor/lang/" + name + ".lang", output_data[name]); - } + liblang.sync_languages(); }; -tasks["tabs-to-spaces"] = function() { - var file_list = (function() { - var ls = []; - const ext = ['java','lang']; - for(var i in ext) ls = ls.concat(fs.find("./src", '*.'+ext[i])); - for(var i in ls) ls[i] = ls[i].replace(/\\/g,"/"); - ls.sort(); - ls.push("readme.md"); - return ls; - })(); - for(var file_i in file_list) { - var file = file_list[file_i]; - var txt = fs.readfile(file); - if(txt===undefined) throw new Error("Failed to read '" + file + "'"); - const txt_length = txt.length; - txt = txt.replace(/[\t]/g," "); - const n = txt.length - txt_length; - if(n > 0) { - print("File '" + file + "': Changed " + n + " tabs to 2 spaces." ); - fs.writefile(file, txt); - } - } -}; - -tasks["trailing-whitespaces"] = function() { - var file_list = (function() { - var ls = []; - const ext = ['java','json','lang']; - for(var i in ext) ls = ls.concat(fs.find("./src", '*.'+ext[i])); - for(var i in ls) ls[i] = ls[i].replace(/\\/g,"/"); - ls.sort(); - ls.push("readme.md"); - return ls; - })(); - for(var file_i in file_list) { - var file = file_list[file_i]; - var txt = fs.readfile(file); - if(txt===undefined) throw new Error("Failed to read '" + file + "'"); - const txt_length = txt.length; - txt = txt.replace(/[\r\t ]+[\n]/g,"\n"); - const n = txt_length - txt.length; - if(n > 0) { - print("File '" + file + "': Fixed " + n + " lines with trailing whitespaces." ); - fs.writefile(file, txt); - } - } -}; - -tasks["version-check"] = function() { - var version_minecraft=""; - var version_forge=""; - var version_engineersdecor=""; - fs.readfile("gradle.properties", function(line){ - if(line.search(/^[\s]*version_minecraft[\s]*=/i) >= 0) { - version_minecraft = line.replace(/^[^=]+=/,"").trim(); - } else if(line.search(/^[\s]*version_forge[\s]*=/i) >= 0) { - version_forge = line.replace(/^[^=]+=/,"").trim(); - } else if(line.search(/^[\s]*version_engineersdecor[\s]*=/i) >= 0) { - version_engineersdecor = line.replace(/^[^=]+=/,"").trim(); - } +tasks["port-languages"] = function() { + fs.find("src/main/resources/assets/"+ constants.mod_registry_name() +"/lang", '*.lang', function(path){ + const unified = liblang.load(path); + path = path.replace(/\.lang$/,""); + liblang13.save("../1.13/"+path+".json", unified); + liblang14.save("../1.14/"+path+".json", unified); return false; - }) - const combined_version = version_minecraft + "-" + version_engineersdecor; - var readme_version_found = fs.readfile("readme.md", function(line){ - var m = line.match(/^[\s]+[-~][\s]+v([\d]+[\.][\d]+[\.][\d]+[-][abrc][\d]+)/i); - if((!m) || (!m.length) || (m.length < 2)) { - m = line.match(/^[\s]+[-~][\s]+v([\d]+[\.][\d]+[\.][\d]+)/i); - if((!m) || (!m.length) || (m.length < 2)) return false; - } - return m[1]==version_engineersdecor; }); - var ok=true; - if(!readme_version_found) { - alert("Version 'v" + version_engineersdecor + "' not found in the readme changelog."); - ok = false; - } - if(!ok) { - alert("Version data:"); - alert(" - combined_version : '" + combined_version + "'"); - alert(" - version_forge : '" + version_forge + "'"); - exit(1); - } }; -tasks["dist"] = function() { - function readme_history(file_path) { - var readme = fs.readfile(file_path); - if(!readme) throw new Error("Failed to load readme.md"); - readme = readme.split(/[\r]?[\n]/); - while((readme.length > 0) && readme[0].search(/^## Revision history/i)<0) readme.shift(); - while((readme.length > 0) && readme[0].trim()=="") readme.shift(); - // revision history section - if(!readme.length) throw new Error("Revision history section not found in readme"); - readme.shift(); - var end_of_history = readme.length; - for(var i=0; i= 0) { end_of_history=i; break; } - if(end_of_history >= readme.length) throw new Error("Could not find the end-of-history header marker."); - // remove empty lines, splitters - while(readme.length >= end_of_history) readme.pop(); - while((readme.length >0) && (readme[readme.length-1].replace(/[\s-]/g,"")=="")) readme.pop(); - - const min_indent = readme - .map(function(s){return s.search(/[^\s]/)}) - .filter(function(e){return e>=0}) - .reduce(function(acc,e){return (e 1) { - for(var i in readme) { readme[i] = readme[i].substr(min_indent-2); } - } - return readme.join("\n"); - } - const html = "
\n" + (readme_history("readme.md").replace(/&/g, "&").replace(/>/g, ">").replace(/";
-  fs.writefile("dist/revision-history.html", html);
-};
-
-tasks["update-json"] = function() {
-  const root_dir = fs.cwd();
-  function read_history() {
-    var readme = fs.readfile(root_dir + "/readme.md");
-    if(!readme) throw new Error("Failed to load readme.md");
-    readme = readme.split(/[\r]?[\n]/);
-    while((readme.length > 0) && readme[0].search(/^## Revision history/i)<0) readme.shift();
-    // revision history section
-    if(!readme.length) throw new Error("Revision history section not found in readme");
-    readme.shift();
-    var end_of_history = readme.length;
-    for(var i=0; i= 0) { end_of_history=i; break; }
-    if(end_of_history >= readme.length) throw new Error("Could not find the end-of-history header marker.");
-    // remove empty lines, splitters
-    while(readme.length >= end_of_history) readme.pop();
-    for(var i in readme) readme[i] = readme[i].replace(/[\s]+$/g,"").replace(/[\t]/g,"  ");
-    readme = readme.filter(function(a){return a.replace(/[\s-]+/g,"")!="";});
-    // condense multilines to single line entries for each fix or feature. ([A] ... [M] ...)
-    for(var i=readme.length-1; i>0; --i) {
-      var line = readme[i].replace(/^\s+/,"");
-      if(line.search(/^[\[\-]/) < 0) {
-        readme[i-1] += " " + line;
-        readme[i] = "";
-      }
-    }
-    readme = readme.filter(function(a){return a!="";});
-    // Condense log entries sepatated with newlines to one line for each version
-    for(var i=readme.length-1; i>0; --i) {
-      var line = readme[i].replace(/^\s+/,"");
-      if(line.search(/^[-~]/) < 0) {
-        readme[i-1] += "\n" + line;
-        readme[i] = "";
-      }
-    }
-    readme = readme.filter(function(a){return a!="";});
-    // Separate versions.
-    var history = {};
-    for(var i in readme) {
-      var line = readme[i].replace(/^[\sv-]+/g,"").trim();
-      var ver = line.substr(0, line.search(" ")).trim().toLowerCase();
-      var txt = line.substr(line.search(" ")).trim();
-      if(ver.search("~")===0) continue;
-      if(history[ver] !== undefined) throw new Error("Double definition of version '" + ver + "' in the readme revision history.");
-      history[ver] = txt;
-    }
-    return history;
-  }
-  var history = read_history();
-  var latest_release = "";
-  var latest_beta = "";
-  for(var ver in history) { latest_beta=ver; break; }
-  for(var ver in history) if(ver.search(/(rc|b|a)/) < 0) { latest_release=ver; break; }
-  var update_json = {
-    homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
-    "1.12.2": history,
-    promos: {
-      "1.12.2-recommended": latest_release,
-      "1.12.2-latest": latest_beta,
-    }
-  }
-  fs.mkdir(root_dir + "/meta");
-  fs.writefile(root_dir + "/meta/update.json", JSON.stringify(update_json, null, 2));
-};
-
-const task_name = sys.args[0];
-if((task_name===undefined) || (tasks[task_name])===undefined) {
-  alert("No task ", task_name);
-  exit(1);
-} else {
-  tasks[task_name]();
-}
+libtask.run(tasks, sys.args);
diff --git a/1.13/readme.md b/1.13/readme.md
index a1c6669..e0552bd 100644
--- a/1.13/readme.md
+++ b/1.13/readme.md
@@ -8,9 +8,10 @@ Mod sources for Minecraft version 1.13.2.
 - Compiled mod distribution channel is curseforge: https://www.curseforge.com/minecraft/mc-mods/engineers-decor/files.
 
 ----
-## Revision history
+## Version history
 
-    ~ v1.0.7-b5 [A]
+    ~ v1.0.7-b5 [A] Added translation zh_cn (PR#33, XuyuEre)
+                [M] Updated textures.
 
     - v1.0.7-b4 [A] Added stained clinker brick block/stairs.
 
diff --git a/1.13/tasks.js b/1.13/tasks.js
index bb7e81e..69e1a44 100644
--- a/1.13/tasks.js
+++ b/1.13/tasks.js
@@ -1,233 +1,13 @@
 #!/usr/bin/djs
 // Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod.
 "use strict";
-if(!fs.chdir(fs.dirname(fs.realpath(sys.script)))) throw new Error("Failed to switch to mod source directory.");
-if(!fs.isdir("../.git")) throw new Error("Missing git repository in parent directory of mod source.");
-
+const constants = include("../meta/lib/constants.js")();
+const libtask = include("../meta/lib/libtask.js")(constants);
+const liblang = include("../meta/lib/liblang.1.13.js")(constants);
 var tasks = {};
 
-tasks["dist-check"] = function() {
-  const uncommitted_changes = sys.shell("git status -s").trim();
-  const gittags = sys.shell('git log -1 --format="%D"')
-                  .replace(/[\s]/g,"").split(",")
-                  .filter(function(s){ return s.indexOf("tag:")==0;})
-                  .map(function(s){ return s.replace(/^tag:/,"");});
-  const version_engineersdecor = fs.readfile("gradle.properties", function(line){
-    if(line.trim().indexOf("version_engineersdecor")!=0) return false;
-    return line.replace(/^.*?=/,"").trim()
-  }).trim();
-  const git_remote = sys.shell("git remote -v").trim();
-  const git_branch = sys.shell("git rev-parse --abbrev-ref HEAD").trim();
-  const git_diff = sys.shell("git diff").trim();
-  var fails = [];
-  if(version_engineersdecor=="") fails.push("Could not determine 'version_engineersdecor' from gradle properties.");
-  if(!gittags.length) fails.push("Version not tagged.");
-  if(!gittags.filter(function(s){return s.indexOf(version_engineersdecor.replace(/[-]/g,""))>=0}).length) fails.push("No tag version not found matching the gradle properties version.");
-  if(git_remote.replace(/[\s]/g,"").indexOf("git@github.com:stfwi/engineers-decor.git(push)") < 0) fails.push("Not the reference repository.");
-  if((git_branch != "develop") && (git_branch != "master")) {
-    fails.push("No valid branch for dist. (branch:'"+git_branch+"')");
-  } else if((git_branch == "develop") && (version_engineersdecor.replace(/[^ab]/g,"")=="")) {
-    fails.push("Cannot make release dist on develop branch.");
-  } else if((git_branch == "master") && (version_engineersdecor.replace(/[^ab]/g,"")!="")) {
-    fails.push("Cannot make beta dist on master branch.");
-  }
-  if(git_diff !== "") fails.push("Not everything committed to the GIT repository.");
-  if((!fs.isfile("signing.jks")) || (!fs.isfile("signing.properties"))) fails.push("Jar signing files missing.");
-  if(fails.length>0) {
-    for(var i in fails) fails[i] = "  - " + fails[i];
-    alert("Dist check failed");
-    alert(fails.join("\n")+"\n");
-    exit(1);
-  }
-};
-
 tasks["sync-languages"] = function() {
- // @todo: has become easier but needs impl.
+  liblang.sync_languages();
 };
 
-tasks["tabs-to-spaces"] = function() {
-  var file_list = (function() {
-    var ls = [];
-    const ext = ['java'];
-    for(var i in ext) ls = ls.concat(fs.find("./src", '*.'+ext[i]));
-    for(var i in ls) ls[i] = ls[i].replace(/\\/g,"/");
-    ls.sort();
-    ls.push("readme.md");
-    return ls;
-  })();
-  for(var file_i in file_list) {
-    var file = file_list[file_i];
-    var txt = fs.readfile(file);
-    if(txt===undefined) throw new Error("Failed to read '" + file + "'");
-    const txt_length = txt.length;
-    txt = txt.replace(/[\t]/g,"  ");
-    const n = txt.length - txt_length;
-    if(n > 0) {
-      print("File '" + file + "': Changed " + n + " tabs to 2 spaces." );
-      fs.writefile(file, txt);
-    }
-  }
-};
-
-tasks["trailing-whitespaces"] = function() {
-  var file_list = (function() {
-    var ls = [];
-    const ext = ['java','json','lang'];
-    for(var i in ext) ls = ls.concat(fs.find("./src", '*.'+ext[i]));
-    for(var i in ls) ls[i] = ls[i].replace(/\\/g,"/");
-    ls.sort();
-    ls.push("readme.md");
-    return ls;
-  })();
-  for(var file_i in file_list) {
-    var file = file_list[file_i];
-    var txt = fs.readfile(file);
-    if(txt===undefined) throw new Error("Failed to read '" + file + "'");
-    const txt_length = txt.length;
-    txt = txt.replace(/[\r\t ]+[\n]/g,"\n");
-    const n = txt_length - txt.length;
-    if(n > 0) {
-      print("File '" + file + "': Fixed " + n + " lines with trailing whitespaces." );
-      fs.writefile(file, txt);
-    }
-  }
-};
-
-tasks["version-check"] = function() {
-  var version_minecraft="";
-  var version_forge="";
-  var version_engineersdecor="";
-  fs.readfile("gradle.properties", function(line){
-    if(line.search(/^[\s]*version_minecraft[\s]*=/i) >= 0) {
-      version_minecraft = line.replace(/^[^=]+=/,"").trim();
-    } else if(line.search(/^[\s]*version_forge[\s]*=/i) >= 0) {
-      version_forge = line.replace(/^[^=]+=/,"").trim();
-    } else if(line.search(/^[\s]*version_engineersdecor[\s]*=/i) >= 0) {
-      version_engineersdecor = line.replace(/^[^=]+=/,"").trim();
-    }
-    return false;
-  })
-  const combined_version = version_minecraft + "-" + version_engineersdecor;
-  var readme_version_found = fs.readfile("readme.md", function(line){
-    var m = line.match(/^[\s]+[-~][\s]+v([\d]+[\.][\d]+[\.][\d]+[-][abrc][\d]+)/i);
-    if((!m) || (!m.length) || (m.length < 2)) {
-      m = line.match(/^[\s]+[-~][\s]+v([\d]+[\.][\d]+[\.][\d]+)/i);
-      if((!m) || (!m.length) || (m.length < 2)) return false;
-    }
-    return m[1]==version_engineersdecor;
-  });
-  var ok=true;
-  if(!readme_version_found) {
-    alert("Version 'v" + version_engineersdecor + "' not found in the readme changelog.");
-    ok = false;
-  }
-  if(!ok) {
-    alert("Version data:");
-    alert(" - combined_version  : '" + combined_version + "'");
-    alert(" - version_forge     : '" + version_forge + "'");
-    exit(1);
-  }
-};
-
-tasks["dist"] = function() {
-  function readme_history(file_path) {
-    var readme = fs.readfile(file_path);
-    if(!readme) throw new Error("Failed to load readme.md");
-    readme = readme.split(/[\r]?[\n]/);
-    while((readme.length > 0) && readme[0].search(/^## Revision history/i)<0) readme.shift();
-    while((readme.length > 0) && readme[0].trim()=="") readme.shift();
-    // revision history section
-    if(!readme.length) throw new Error("Revision history section not found in readme");
-    readme.shift();
-    var end_of_history = readme.length;
-    for(var i=0; i= 0) { end_of_history=i; break; }
-    if(end_of_history >= readme.length) throw new Error("Could not find the end-of-history header marker.");
-    // remove empty lines, splitters
-    while(readme.length >= end_of_history) readme.pop();
-    while((readme.length >0) && (readme[readme.length-1].replace(/[\s-]/g,"")=="")) readme.pop();
-
-    const min_indent = readme
-      .map(function(s){return s.search(/[^\s]/)})
-      .filter(function(e){return e>=0})
-      .reduce(function(acc,e){return (e 1) {
-      for(var i in readme) { readme[i] = readme[i].substr(min_indent-2); }
-    }
-    return readme.join("\n");
-  }
-  const html = "
\n" + (readme_history("readme.md").replace(/&/g, "&").replace(/>/g, ">").replace(/";
-  fs.writefile("dist/revision-history.html", html);
-};
-
-tasks["update-json"] = function() {
-  const root_dir = fs.cwd();
-  function read_history() {
-    var readme = fs.readfile(root_dir + "/readme.md");
-    if(!readme) throw new Error("Failed to load readme.md");
-    readme = readme.split(/[\r]?[\n]/);
-    while((readme.length > 0) && readme[0].search(/^## Revision history/i)<0) readme.shift();
-    // revision history section
-    if(!readme.length) throw new Error("Revision history section not found in readme");
-    readme.shift();
-    var end_of_history = readme.length;
-    for(var i=0; i= 0) { end_of_history=i; break; }
-    if(end_of_history >= readme.length) throw new Error("Could not find the end-of-history header marker.");
-    // remove empty lines, splitters
-    while(readme.length >= end_of_history) readme.pop();
-    for(var i in readme) readme[i] = readme[i].replace(/[\s]+$/g,"").replace(/[\t]/g,"  ");
-    readme = readme.filter(function(a){return a.replace(/[\s-]+/g,"")!="";});
-    // condense multilines to single line entries for each fix or feature. ([A] ... [M] ...)
-    for(var i=readme.length-1; i>0; --i) {
-      var line = readme[i].replace(/^\s+/,"");
-      if(line.search(/^[\[\-]/) < 0) {
-        readme[i-1] += " " + line;
-        readme[i] = "";
-      }
-    }
-    readme = readme.filter(function(a){return a!="";});
-    // Condense log entries sepatated with newlines to one line for each version
-    for(var i=readme.length-1; i>0; --i) {
-      var line = readme[i].replace(/^\s+/,"");
-      if(line.search(/^[-~]/) < 0) {
-        readme[i-1] += "\n" + line;
-        readme[i] = "";
-      }
-    }
-    readme = readme.filter(function(a){return a!="";});
-    // Separate versions.
-    var history = {};
-    for(var i in readme) {
-      var line = readme[i].replace(/^[\sv-]+/g,"").trim();
-      var ver = line.substr(0, line.search(" ")).trim().toLowerCase();
-      var txt = line.substr(line.search(" ")).trim();
-      if(ver.search("~")===0) continue;
-      if(history[ver] !== undefined) throw new Error("Double definition of version '" + ver + "' in the readme revision history.");
-      history[ver] = txt;
-    }
-    return history;
-  }
-  var history = read_history();
-  var latest_release = "";
-  var latest_beta = "";
-  for(var ver in history) { latest_beta=ver; break; }
-  for(var ver in history) if(ver.search(/(rc|b|a)/) < 0) { latest_release=ver; break; }
-  var update_json = {
-    homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
-    "1.13.2": history,
-    promos: {
-      "1.13.2-recommended": latest_release,
-      "1.13.2-latest": latest_beta,
-    }
-  }
-  fs.mkdir(root_dir + "/meta");
-  fs.writefile(root_dir + "/meta/update.json", JSON.stringify(update_json, null, 2));
-};
-
-const task_name = sys.args[0];
-if((task_name===undefined) || (tasks[task_name])===undefined) {
-  alert("No task ", task_name);
-  exit(1);
-} else {
-  tasks[task_name]();
-}
+libtask.run(tasks, sys.args);
diff --git a/Makefile b/Makefile
index 3c85508..6ef3314 100644
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,26 @@
 # Note for reviewers/clones: This file is a auxiliary script for my setup.
 # It's not needed to build the mod.
 #
-.PHONY: default init clean clean-all dist sync-main-repo sanatize update-json
-.PHONY: init-1.12 clean-1.12 clean-all-1.12 dist-1.12 sanatize-1.12
-.PHONY: init-1.13 clean-1.13 clean-all-1.13 dist-1.13 sanatize-1.13
+.PHONY: default init clean clean-all mrproper sanatize dist update-json sync-main-repo compare migrate-from-112
 
-default:	;	@echo "(You are not in a MC specific version directory)"
-clean: clean-1.12 clean-1.13
-clean-all: clean-all-1.13
-init: init-1.12 init-1.13
+default:	;	@echo "First change to specific version directory."
+init: default
+dist: default
 
-clean-1.12: 		; -@cd 1.12; make -s clean
-clean-1.13: 		; -@cd 1.13; make -s clean
-clean-all-1.12: ;	-@cd 1.12; make -s clean-all
-clean-all-1.13: ;	-@cd 1.13; make -s clean-all
-init-1.12:			; -@cd 1.12; make -s init
-init-1.13:			; -@cd 1.13; make -s init
-dist-1.12:			; @cd 1.12; make -s dist
-dist-1.13:			; @cd 1.13; make -s dist
-dist:           ; @echo "First change to specific version directory."
+clean:
+	-@cd 1.12; make -s clean
+	-@cd 1.13; make -s clean
+	-@cd 1.14; make -s clean
+
+clean-all:
+	-@cd 1.12; make -s clean-all
+	-@cd 1.13; make -s clean-all
+	-@cd 1.14; make -s clean-all
+
+mrproper:
+	-@cd 1.12; make -s mrproper
+	-@cd 1.13; make -s mrproper
+	-@cd 1.14; make -s mrproper
 
 update-json:
 	@echo "[main] Update update.json ..."
@@ -31,9 +33,18 @@ update-json:
 
 sanatize:
 	@cd 1.12; make -s sanatize
+	@cd 1.12; make -s port-languages
 	@cd 1.13; make -s sanatize
+	@cd 1.14; make -s sanatize
 	@make -s update-json
 
+compare:
+	@djs tasks.js compare-blockstates -v
+	@djs tasks.js compare-textures -v
+
+migrate-from-112:
+	@djs tasks.js migrate-textures -v
+
 # For reviewers: I am using a local repository for experimental changes,
 # this target copies the local working tree to the location of the
 # repository that you cloned.
diff --git a/meta/lib/constants.js b/meta/lib/constants.js
new file mode 100644
index 0000000..dc5d30a
--- /dev/null
+++ b/meta/lib/constants.js
@@ -0,0 +1,19 @@
+"use strict";
+(function(){
+  var c = {};
+  c.mod_registry_name = function() { return "engineersdecor" }
+  c.reference_repository = function() { return "git@github.com:stfwi/engineers-decor.git"; }
+  c.gradle_property_modversion = function() { return "version_engineersdecor"; }
+  c.gradle_property_version_minecraft = function() { return "version_minecraft"; }
+  c.gradle_property_version_forge = function() { return "version_forge"; }
+  c.project_download_inet_page = function() { return "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/"; }
+  c.languages = {
+    "en_us": { code:"en_us", name:"English", region:"United States" },
+    "de_de": { code:"de_de", name:"German", region:"Germany" },
+    "ru_ru": { code:"ru_ru", name:"Russian", region:"Russia" },
+    "zh_cn": { code:"zh_cn", name:"Chinese", region:"China" }
+  }
+  Object.freeze(c.languages);
+  Object.freeze(c);
+  return c;
+});
\ No newline at end of file
diff --git a/meta/lib/libassets.js b/meta/lib/libassets.js
new file mode 100644
index 0000000..3563a9a
--- /dev/null
+++ b/meta/lib/libassets.js
@@ -0,0 +1,127 @@
+"use strict";
+(function(constants){
+  var me = {};
+
+
+  /**
+   * Determines a list of all textures in the given path as plain object,
+   * where the keys are the unified texture path (e.g. "block/", not "blocks/"),
+   * and the value an object containing file path, SHA1, size, etc.
+   * @returns {object}
+   */
+  me.load_texture_data = function(textures_path) {
+    const wd = fs.cwd();
+    var data = {};
+    try {
+      if(!fs.chdir(textures_path)) throw new Error("Texture root path does not exist: '" + textures_path + "'");
+      fs.find(".", '*.*', function(path) {
+        const file = path.replace(/[\\]/g, "/").replace(/^\.\//,"");
+        const unified_file = file.replace(/^blocks\//, "block/");
+        data[unified_file] = { path:file, size:fs.size(file), sha:sys.hash.sha1(path, true) };
+        return false;
+      });
+      return data;
+    } finally {
+      fs.chdir(wd);
+    }
+  }
+
+  /**
+   * Compares texture files and mcdata files two given assets paths, returns the
+   * lists of both file trees and the differences as object.
+   * @returns {object}
+   */
+  me.compare_textures = function(assets_path_a, assets_path_b) {
+    const txpath_a = assets_path_a + "/" + constants.mod_registry_name() + "/textures";
+    const txpath_b = assets_path_b + "/" + constants.mod_registry_name() + "/textures";
+    const a = me.load_texture_data(txpath_a);
+    const b = me.load_texture_data(txpath_b);
+    const txpath_a_is112 = fs.isdir(txpath_a + "/blocks");
+    const txpath_b_is112 = fs.isdir(txpath_b + "/blocks");
+    const cmp = {a:{},b:{}};
+    cmp.a.path = txpath_a;
+    cmp.b.path = txpath_b;
+    cmp.a.is112 = txpath_a_is112;
+    cmp.b.is112 = txpath_b_is112;
+    cmp.a.files = Object.assign({},a);
+    cmp.b.files = Object.assign({},b);
+    cmp.match = {}
+    cmp.differ = {}
+    cmp.onlyin_a = {}
+    cmp.onlyin_b = {}
+    for(var key in a) {
+      if(b[key] === undefined) {
+        cmp.onlyin_a[key] = a[key];
+        continue;
+      }
+      if(a[key].sha === b[key].sha) {
+        cmp.match[key] = a[key];
+        b[key]=undefined; delete b[key];
+      } else {
+        cmp.differ[key] = { a:a[key], b:b[key] };
+        b[key]=undefined; delete b[key];
+      }
+    }
+    a = undefined;
+    for(var key in b) {
+      cmp.onlyin_b[key] = b[key];
+    }
+    b = undefined;
+    return cmp;
+  };
+
+  /**
+   * Loads all blockstate files in the given assets path, and returns the parsed JSON
+   * data as plain object, where the keys are the blockstate names, and the value the
+   * parsed JSON files.
+   * @returns {object}
+   */
+  me.load_blockstates = function(assets_path) {
+    const wd = fs.cwd();
+    var data = {};
+    try {
+      if(!fs.chdir(assets_path+"/blockstates")) throw new Error("blockstates path not found in: '" + assets_path + "'");
+      fs.find(".", '*.json', function(path) {
+        const file = path.replace(/[\\]/g, "/").replace(/^\.\//,"");
+        if(fs.basename(file) != fs.basename(file).toLowerCase()) throw new Error("Blockstate file must be lowercase: '"+file+"'"); // hard fail
+        const blockstate_name = fs.basename(file).replace(/[\.]json/i, "");
+        if(blockstate_name.search(/[^a-z0-9_]/) >= 0) throw new Error("Blockstate file name contains invalid characters: '"+file+"'"); // here, too
+        var json = fs.readfile(path);
+        if(json===undefined) throw new Error("Failed to read blockstate file '"+file+"' (could not open file)");
+        try { json=JSON.parse(json); } catch(ex) { throw new Error("Failed to parse blockstate file '"+file+"' (invalid JSON)"); }
+        data[blockstate_name] = {file:(assets_path+"/blockstates/"+file), data:json};
+        return false;
+      });
+      return data;
+    } finally {
+      fs.chdir(wd);
+    }
+  };
+
+  me.compare_blockstates = function(assets_path_a, assets_path_b) {
+    const a = me.load_blockstates(assets_path_a);
+    const b = me.load_blockstates(assets_path_b);
+    const onlyin_a = {};
+    const onlyin_b = {};
+    for(var key in a) {
+      if(b[key] === undefined) {
+        onlyin_a[key] = a[key];
+        continue;
+      } else {
+        b[key]=undefined; delete b[key];
+      }
+    }
+    a = undefined;
+    for(var key in b) {
+      onlyin_b[key] = b[key];
+    }
+    b = undefined;
+    return {
+      onlyin_a: onlyin_a,
+      onlyin_b: onlyin_b,
+    }
+  };
+
+  Object.freeze(me);
+  return me;
+});
\ No newline at end of file
diff --git a/meta/lib/liblang.1.12.js b/meta/lib/liblang.1.12.js
new file mode 100644
index 0000000..7c3e658
--- /dev/null
+++ b/meta/lib/liblang.1.12.js
@@ -0,0 +1,205 @@
+"use strict";
+(function(constants){
+  var me = {};
+
+  /**
+   * Loads the raw data of the lang file.
+   * @returns {object}
+   */
+  me.load_raw = function(file_path, remove_comments) {
+    const lang_code = fs.basename(file_path).replace(/\..*$/,"").trim().toLowerCase();
+    var lines = fs.readfile(file_path).trim().split("\n");
+    var was_eol_escape = false;
+    for(var i in lines) {
+      if(was_eol_escape) {
+        var k=0;
+        for(k=i-1; k>=0; --k) {
+          if(lines[k] != null) {
+            lines[k] += "\n" + lines[i];
+            break;
+          }
+        }
+        was_eol_escape = lines[i].match(/[^\\][\\]$/) != null;
+        lines[i] = null;
+      } else {
+        lines[i] = lines[i].trim();
+        was_eol_escape = lines[i].match(/[^\\][\\]$/) != null;
+      }
+    }
+    lines = lines.filter(function(l){return (l!==null)});
+    if(!!remove_comments) lines = lines.filter(function(l){return (l.trim().search(/^#/)!=0)});
+    return { code:lang_code, data:lines };
+  }
+
+  /**
+   * Loads a language into a unified object format
+   */
+  me.load = function(file_path) {
+    const modid = constants.mod_registry_name();
+    const data = {
+      creative_tab: "",
+      config_title: "",
+      blocks: {},
+      items: {},
+      other: {},
+      lang: {},
+      invalid: {}
+    };
+    var lines = me.load_raw(file_path, true).data.map(function(line){return line.replace(/[\s]*[\\][\r]?[\n][\s]*/mig, " ").trim()});
+    for(var i in lines) {
+      if(!lines[i].length) continue;
+      const kv = lines[i].split("=", 2);
+      if(kv.length!=2) throw new Error("Invalid line in '"+file_path+"': '"+lines[i]+"'");
+      const key = kv[0].trim();
+      const text = kv[1].trim();
+      if(key.length == 0) {
+        throw new Error("Empty key in '"+file_path+"' line '" + lines[i] + "'");
+      } else if(key.search("tile."+modid+".")==0) {
+        key = key.replace("tile."+modid+".", "");
+        key = key.split(".", 2);
+        const block = key[0];
+        const prop = key[1];
+        if(data.blocks[block]===undefined) data.blocks[block] = {};
+        data.blocks[block][prop] = text;
+      } else if(key.search("item."+modid+".")==0) {
+        key = key.replace("item."+modid+".", "");
+        key = key.split(".", 2);
+        const item = key[0];
+        const prop = key[1];
+        if(data.items[item]===undefined) data.blocks[item] = {};
+        data.blocks[item][prop] = text;
+      } else if(key.search(modid + ".config.title")==0) {
+        data.config_title = text;
+      } else if(key.search("itemGroup.tab" + modid)==0) {
+        data.creative_tab = text;
+      } else if(key.search(modid + ".")==0) {
+        data.other[key] = text;
+      } else {
+        data.invalid[key] = text;
+      }
+    }
+    const lang_code = fs.basename(file_path).replace(/[\.].*$/, "").trim().toLowerCase();
+    if(constants.languages[lang_code] === undefined) throw new Error("No language header constants defined for '" + lang_code + "'");
+    data.lang = constants.languages[lang_code];
+    return data;
+  }
+
+  /**
+   * Saves a language in the version specific MC format from
+   * a unified object format.
+   */
+  me.save = function(file_path, lang_data) {
+    throw new Error("lang.save() not implemented yet for 1.12 lang files.");
+  }
+
+  /**
+   * Adds missing entries to the language file, master is en_us.
+   * Applies to the CWD and 1.12.2 lang files.
+   * @returns {void}
+   */
+  me.sync_languages = function(reflang_code) {
+    if(reflang_code===undefined) reflang_code = "en_us";
+    reflang_code = reflang_code.trim().toLowerCase();
+    function load() {
+      var lang_data = {};
+      fs.find("./src/main/resources/assets/"+ constants.mod_registry_name() +"/lang", '*.lang', function(f){
+        const r = me.load_raw(f);
+        lang_data[r.code] = r.data;
+        return false;
+      });
+      return lang_data;
+    }
+    function reference_content(lang_data, reflang_code) {
+      var lang_lines = [];
+      for(var i in lang_data[reflang_code]) {
+        var txt = lang_data[reflang_code][i].trim();
+        if((txt.search(/^#/)>=0) || (txt.search("=")<0)) { lang_lines.push(txt); continue; }; // comment "#" or empty line in the ref lang file
+        var kv = txt.split("=", 2);
+        var key = kv[0].trim();
+        var val = kv[1].trim();
+        var o = {key:key, tr:{}};
+        o.tr[reflang_code] = val;
+        lang_lines.push(o);
+      }
+      delete lang_data[reflang_code];
+      return lang_lines;
+    }
+    function add_language(lang_lines, lang_name, lang_data) {
+      const find_line = function(lines, key) {
+        for(var i in lines) {
+          if((typeof(lines[i]) !== "object")) continue;
+          if(lines[i].key.toLowerCase()==key.toLowerCase()) return i;
+        }
+        return -1;
+      };
+      for(var i in lang_data) {
+        var txt = lang_data[i].trim();
+        if(txt.search(/^#/)>=0) continue;
+        if(txt.search("=")<0) continue;
+        var kv = txt.split("=", 2);
+        var key = kv[0].trim();
+        var val = kv[1].trim();
+        var line_i = find_line(lang_lines, key);
+        if(line_i >= 0) {
+          lang_data[i] = undefined;
+          lang_lines[line_i].tr[lang_name] = val;
+        }
+      }
+      return lang_data;
+    }
+
+    function complete_lang_lines(lang_lines, lang_names, reflang_code) {
+      var lang_outputs = {};
+      for(var i in lang_names) lang_outputs[lang_names[i]] = [];
+      for(var i_line in lang_lines) {
+        var entry = lang_lines[i_line];
+        if(typeof(entry) !== "object") {
+          for(var i in lang_names) lang_outputs[lang_names[i]].push(entry);
+        } else {
+          for(var i in lang_names) {
+            var name = lang_names[i];
+            if(entry.tr[name] !== undefined) {
+              lang_outputs[name].push(entry.key + "=" + entry.tr[name]);
+            } else {
+              var added = entry.key + "=" + entry.tr[reflang_code];
+              if((entry.key.search(/\.tip$/)>0) || (entry.key.search(/\.help$/)>0)) added = "#" + added;
+              lang_outputs[name].push(added);
+              if(added.search(/^#/)<0) print("[warn] Lang: Added default language for missing entry in " + name + ": '" + added + "'");
+            }
+          }
+        }
+      }
+      return lang_outputs;
+    }
+
+    var lang_data = load();
+    var lang_names = Object.keys(lang_data);
+    var lang_lines = reference_content(lang_data, reflang_code);
+    for(var lang_name in lang_data) {
+      lang_data[lang_name] = add_language(lang_lines, lang_name, lang_data[lang_name]);
+      lang_data[lang_name] = lang_data[lang_name].filter(function(l){ return !!l; });
+      if(lang_data[lang_name].length == 0) delete lang_data[lang_name];
+    }
+    var output_data = complete_lang_lines(lang_lines, lang_names, reflang_code);
+    for(var i in output_data) output_data[i] = output_data[i].join("\n") + "\n\n";
+
+    // Remaining lines in lang files (not in the reference lang file)
+    for(var lang_name in lang_data) {
+      for(var i in lang_data[lang_name]) {
+        if(lang_data[lang_name][i].search(/^#/)<0) {
+          var added = "# " + lang_data[lang_name][i].replace(/^[#\s]+/,"");
+          output_data[lang_name] += added + "\n";
+          print("[warn] Lang: Commented out unknown key in " + lang_name + ": '" + added + "'");
+        }
+      }
+    }
+    for(var name in output_data) output_data[name] = output_data[name].trim() + "\n";
+
+    for(var name in output_data) {
+      fs.writefile("./src/main/resources/assets/engineersdecor/lang/" + name + ".lang", output_data[name]);
+    }
+  };
+
+  Object.freeze(me);
+  return me;
+});
\ No newline at end of file
diff --git a/meta/lib/liblang.1.13.js b/meta/lib/liblang.1.13.js
new file mode 100644
index 0000000..0804d52
--- /dev/null
+++ b/meta/lib/liblang.1.13.js
@@ -0,0 +1,122 @@
+"use strict";
+(function(constants){
+  var me = {};
+
+  /**
+   * Loads the raw data of the lang file.
+   * @returns {object}
+   */
+  me.load_raw = function(file_path) {
+    const lang_code = fs.basename(file_path).replace(/\..*$/,"").trim().toLowerCase();
+    const data = JSON.parse(fs.readfile(file_path).trim());
+    return { code:lang_code, data:data };
+  }
+
+  /**
+   * Loads
+   */
+  me.load = function(file_path) {
+    const modid = constants.mod_registry_name();
+    const data = {
+      creative_tab: "",
+      config_title: "",
+      blocks: {},
+      items: {},
+      other: {},
+      lang: {},
+      invalid: {}
+    };
+    var lines = me.load_raw(file_path).data;
+    for(var objkey in lines) {
+      const key = objkey.trim();
+      const text = lines[objkey].trim();
+      if(key.length == 0) {
+        throw new Error("Empty key in '"+file_path+"' line '" + lines[i] + "'");
+      } else if(key.search("block."+modid+".")==0) {
+        key = key.replace("block."+modid+".", "");
+        key = key.split(".", 2);
+        const block = key[0];
+        const prop = ((key.length<2) || (key[1]=="")) ? "name" : key[1];
+        if(data.blocks[block]===undefined) data.blocks[block] = {};
+        data.blocks[block][prop] = text;
+      } else if(key.search("item."+modid+".")==0) {
+        key = key.replace("item."+modid+".", "");
+        key = key.split(".", 2);
+        const item = key[0];
+        const prop = ((key.length<2) || (key[1]=="")) ? "name" : key[1];
+        if(data.items[item]===undefined) data.blocks[item] = {};
+        data.blocks[item][prop] = text;
+      } else if(key.search(modid + ".config.title")==0) {
+        data.config_title = text;
+      } else if(key.search("itemGroup.tab" + modid)==0) {
+        data.creative_tab = text;
+      } else if(key.search(modid + ".")==0) {
+        data.other[key] = text;
+      } else if(key.search("language")==0) {
+        key = key.replace("language", "");
+        key = key.split(".", 2);
+        const prop = ((key.length<2) || (key[1]=="")) ? "name" : key[1];
+        data.lang[prop] = text;
+      } else {
+        data.invalid[key] = text;
+      }
+    }
+    return data;
+  }
+
+  /**
+   * Saves a language in the version specific MC format from
+   * a unified object format.
+   */
+  me.save = function(file_path, data) {
+    if(Object.keys(data.invalid).length > 0) throw new Error("Given language data have entries in the marked-invalid data, fix this first.");
+    const modid = constants.mod_registry_name();
+    var out = {};
+    out["language"] = data.lang.name;
+    out["language.code"] = data.lang.code;
+    out["language.region"] = data.lang.region;
+    out["itemGroup.tab" + modid] = data.creative_tab;
+    out[modid+".config.title"] = data.config_title;
+    for(var it in data.other) {
+      out[it] = data.other[it];
+    }
+    for(var blkname in data.blocks) {
+      var blk = data.blocks[blkname];
+      for(var key in blk) {
+        if(key=="name") {
+          out["block."+modid+"."+blkname] = blk[key];
+        } else {
+          out["block."+modid+"."+blkname+"."+key] = blk[key];
+        }
+      }
+    }
+    for(var itemname in data.items) {
+      var item = data.items[itemname];
+      for(var key in item) {
+        if(key=="name") {
+          out["item."+modid+"."+itemname] = item[key];
+        } else {
+          out["item."+modid+"."+itemname+"."+key] = item[key];
+        }
+      }
+    }
+    var txt = JSON.stringify(out,null,1);
+    var file_lang_code = fs.basename(file_path).replace(/\.json/,"");
+    const filename = fs.basename(file_path);
+    if(filename.toLowerCase() != filename) throw new Error("Language files must be completely lowercase.");
+    if(file_lang_code != data.lang.code) throw new Error("File name to save does not contain the language code of the given data.");
+    if(filename.search("\.json$") <= 0) throw new Error("File name to save must be a json file (lowercase).");
+    if(!fs.isdir(fs.dirname(file_path))) throw new Error("File to save: Parent directory does not exist.");
+    fs.writefile(file_path, txt);
+  }
+
+  /**
+   * Adds missing entries to the language file, master is en_us.
+   * Applies to the CWD and 1.12.2 lang files.
+   * @returns {void}
+   */
+  me.sync_languages = function(reflang_code) {};
+
+  Object.freeze(me);
+  return me;
+});
\ No newline at end of file
diff --git a/meta/lib/libtask.js b/meta/lib/libtask.js
new file mode 100644
index 0000000..ee7c87d
--- /dev/null
+++ b/meta/lib/libtask.js
@@ -0,0 +1,383 @@
+#!/usr/bin/djs
+// Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod.
+"use strict";
+
+(function(constants){
+  const me = {'tasks':{}, 'parsing':{},'sanatizing':{}};
+
+  /**
+   * Returns the version history as full text from a given file path.
+   * @returns {string}
+   */
+  me.parsing.readme_history_section = function (file_path) {
+    var readme = fs.readfile(file_path);
+    if(!readme) throw new Error("Failed to load readme.md");
+    readme = readme.split(/[\r]?[\n]/);
+    while((readme.length > 0) && readme[0].search(/^## Version history/i)<0) readme.shift();
+    while((readme.length > 0) && readme[0].trim()=="") readme.shift();
+    // version history section
+    if(!readme.length) throw new Error("Version history section not found in readme");
+    readme.shift();
+    var end_of_history = readme.length;
+    for(var i=0; i= 0) { end_of_history=i; break; }
+    if(end_of_history >= readme.length) throw new Error("Could not find the end-of-history header marker.");
+    // remove empty lines, splitters
+    while(readme.length >= end_of_history) readme.pop();
+    while((readme.length >0) && (readme[readme.length-1].replace(/[\s-]/g,"")=="")) readme.pop();
+    const min_indent = readme
+      .map(function(s){return s.search(/[^\s]/)})
+      .filter(function(e){return e>=0})
+      .reduce(function(acc,e){return (e 1) {
+      for(var i in readme) { readme[i] = readme[i].substr(min_indent-2); }
+    }
+    return readme.join("\n");
+  }
+
+  /**
+   * Returns the version history as array of version-text pairs from a given file path.
+   * @returns {array}
+   */
+  me.parsing.readme_changelog = function(file_path) {
+    var readme = me.parsing.readme_history_section(file_path).split(/[\r]?[\n]/);
+    var versions = [];
+    var ver="", txt=[];
+    const addversion = function(){
+      if((ver.length == 0) && (txt.length == 0)) return;
+      if((ver.length > 0) != (txt.length > 0)) throw new Error("Version entry with empty corresponding text.");
+      for(var i in txt) txt[i] = txt[i].trim();
+      for(var i=txt.length-1; i>0; --i) {
+        if((txt[i].length == 0) || (txt[i][0] == '[')) continue;
+        txt[i-1] += " " + txt[i];
+        txt[i] = "";
+      }
+      txt = txt.filter(function(v){return v.length>0;});
+      for(var i in txt) txt[i] = txt[i].replace(/[\s]+/, " ");
+      versions.push({ver:ver,txt:txt});
+    };
+    for(var il in readme) {
+      var line = readme[il];
+      if(line.replace(/[\s-]+/, "").length == 0) {
+        continue; // separator line
+      } if(line.search(/^[\s]*[~-][\s]*v[\d]+[\.][\d]+[\.][\d]/) == 0) {
+        addversion();
+        var is_preversion = (line.search(/^[\s]*[~]/) == 0);
+        ver = line.replace(/^[\s]*[~-][\s]*/,"").replace(/[\s].*$/,"").toLowerCase();
+        txt = [line.replace(ver, " ".repeat(ver.length)).replace(/^[\s]*[~-]/, function(m){ return " ".repeat(m.length); })];
+        if(is_preversion) ver = "~" + ver;
+      } else {
+        txt.push(line);
+      }
+    }
+    addversion();
+    return versions;
+  };
+
+  /**
+   * Returns the versions known from the readme
+   * @returns {array}
+   */
+  me.parsing.readme_versions = function(file_path, no_pre_versions) {
+    var o = me.parsing.readme_changelog(file_path);
+    var versions = [];
+    for(var i in o) versions.push(o[i].ver);
+    if(!no_pre_versions) return versions;
+    versions = versions.filter(function(v){ return v[0]!="~"; });
+    return versions;
+  }
+
+  /**
+   * Returns the gradle.properties settings as key-value plain object.
+   * @returns {object}
+   */
+  me.parsing.gradle_properties = function(file_path) {
+    var lines = fs.readfile(file_path).split(/[\r]?[\n]/);
+    var properties = {};
+    for(var i in lines) {
+      var line = lines[i].trim();
+      if(line.search("#")==0) continue;
+      if(line.search("//")>=0) { line=line.substr(0, line.search("//")).trim(); }
+      if(line.search(/^[a-z][a-z0-9_\.]+[=]/i) < 0) continue;
+      line = line.split("=", 2);
+      properties[line[0].trim()] = line[1].trim();
+    }
+    return properties;
+  }
+
+  /**
+   * Changes one tab to two spaces in files with the given extension
+   * recursively found in the current working directory.
+   * @returns {void}
+   */
+  me.sanatizing.tabs_to_spaces = function(extensions) {
+    var file_list = (function() {
+      var ls = [];
+      const ext = extensions;
+      for(var i in ext) ls = ls.concat(fs.find("./src", '*.'+ext[i]));
+      for(var i in ls) ls[i] = ls[i].replace(/\\/g,"/");
+      ls.sort();
+      ls.push("readme.md");
+      return ls;
+    })();
+    for(var file_i in file_list) {
+      var file = file_list[file_i];
+      var txt = fs.readfile(file);
+      if(txt===undefined) throw new Error("Failed to read '" + file + "'");
+      const txt_length = txt.length;
+      txt = txt.replace(/[\t]/g,"  ");
+      const n = txt.length - txt_length;
+      if(n > 0) {
+        print("File '" + file + "': Changed " + n + " tabs to 2 spaces." );
+        fs.writefile(file, txt);
+      }
+    }
+  };
+
+  /**
+   * Removes space characters at the end of lines in files with the given
+   * extension recursively found in the current working directory.
+   * @returns {void}
+   */
+  me.sanatizing.remove_trailing_whitespaces = function(extensions) {
+    var file_list = (function() {
+      var ls = [];
+      const ext = extensions;
+      for(var i in ext) ls = ls.concat(fs.find("./src", '*.'+ext[i]));
+      for(var i in ls) ls[i] = ls[i].replace(/\\/g,"/");
+      ls.sort();
+      ls.push("readme.md");
+      return ls;
+    })();
+    for(var file_i in file_list) {
+      var file = file_list[file_i];
+      var txt = fs.readfile(file);
+      if(txt===undefined) throw new Error("Failed to read '" + file + "'");
+      const txt_length = txt.length;
+      txt = txt.replace(/[\r\t ]+[\n]/g,"\n");
+      const n = txt_length - txt.length;
+      if(n > 0) {
+        print("File '" + file + "': Fixed " + n + " lines with trailing whitespaces." );
+        fs.writefile(file, txt);
+      }
+    }
+  };
+
+  /**
+   * Checks the versions specified in the gradle.properties against
+   * the last readme.md changelog version. Applies to the CWD.
+   * @returns {object}
+   */
+  me.tasks.version_check = function(allow_preversions) {
+    var fails = [];
+    const properties = me.parsing.gradle_properties("gradle.properties");
+    const version_minecraft = properties[constants.gradle_property_version_minecraft()];
+    const version_forge = properties[constants.gradle_property_version_forge()];
+    const version_mod = properties[constants.gradle_property_modversion()];
+    const combined_version = version_minecraft + "-" + version_mod;
+    const readme_versions = me.parsing.readme_versions("readme.md").map(function(v){return v.replace(/^[v]/i, "").trim()});
+    const readme_preversion_found = (readme_versions.filter(function(v){return v==("~v"+version_mod)}).length == 1);
+    var readme_version_found = readme_versions.filter(function(v){return v==version_mod}).length == 1;
+    if(allow_preversions && readme_preversion_found) readme_version_found = true;
+    if(!readme_version_found) fails.push("Version 'v" + version_mod + "' not found in the readme changelog.");
+    return {
+      fails: fails,
+      version_mod: version_mod,
+      combined_version: combined_version,
+      version_forge: version_forge,
+      preversion_found: readme_preversion_found
+    }
+  };
+
+  /**
+   * Distribution JAR pre-checks.
+   * @returns {array}
+   */
+  me.tasks.dist_check = function() {
+    const uncommitted_changes = sys.shell("git status -s").trim();
+    const gittags = sys.shell('git log -1 --format="%D"')
+                    .replace(/[\s]/g,"").split(",")
+                    .filter(function(s){ return s.indexOf("tag:")==0;})
+                    .map(function(s){ return s.replace(/^tag:/,"");});
+    const modversion = fs.readfile("gradle.properties", function(line){
+      if(line.trim().indexOf(constants.gradle_property_modversion())!=0) return false;
+      return line.replace(/^.*?=/,"").trim()
+    }).trim();
+    const git_remote = sys.shell("git remote -v").trim();
+    const git_branch = sys.shell("git rev-parse --abbrev-ref HEAD").trim();
+    const git_diff = sys.shell("git diff .").trim();
+    var fails = [];
+    if(modversion=="") fails.push("Could not determine '"+ constants.gradle_property_modversion() +"' from gradle properties.");
+    if(!gittags.length) fails.push("Version not tagged.");
+    if(!gittags.filter(function(s){return s.indexOf(modversion.replace(/[-]/g,""))>=0}).length) fails.push("No tag version not found matching the gradle properties version.");
+    if(git_remote.replace(/[\s]/g,"").indexOf(constants.reference_repository() + "(push)") < 0) fails.push("Not the reference repository.");
+    if((git_branch != "develop") && (git_branch != "master")) {
+      fails.push("No valid branch for dist. (branch:'"+git_branch+"')");
+    } else if((git_branch == "develop") && (modversion.replace(/[^ab]/g,"")=="")) {
+      fails.push("Cannot make release dist on develop branch.");
+    } else if((git_branch == "master") && (modversion.replace(/[^ab]/g,"")!="")) {
+      fails.push("Cannot make beta dist on master branch.");
+    }
+    if(git_diff !== "") fails.push("Not everything committed to the GIT repository.");
+    // if((!fs.isfile("signing.jks")) || (!fs.isfile("signing.properties"))) fails.push("Jar signing files missing.");
+    return fails;
+  };
+
+  /**
+   * Returns a version check object for the given MC version.
+   */
+  me.tasks.changelog_data = function(mc_version) {
+    if(mc_version===undefined) throw new Error("No MC version given for generating an update JSON.");
+    mc_version = (""+mc_version).trim();
+    function read_history() {
+      var readme = fs.readfile(fs.cwd() + "/readme.md");
+      if(!readme) throw new Error("Failed to load readme.md");
+      readme = readme.split(/[\r]?[\n]/);
+      while((readme.length > 0) && readme[0].search(/^## Version history/i)<0) readme.shift();
+      // version history section
+      if(!readme.length) throw new Error("Version history section not found in readme");
+      readme.shift();
+      var end_of_history = readme.length;
+      for(var i=0; i= 0) { end_of_history=i; break; }
+      if(end_of_history >= readme.length) throw new Error("Could not find the end-of-history header marker.");
+      // remove empty lines, splitters
+      while(readme.length >= end_of_history) readme.pop();
+      for(var i in readme) readme[i] = readme[i].replace(/[\s]+$/g,"").replace(/[\t]/g,"  ");
+      readme = readme.filter(function(a){return a.replace(/[\s-]+/g,"")!="";});
+      // condense multilines to single line entries for each fix or feature. ([A] ... [M] ...)
+      for(var i=readme.length-1; i>0; --i) {
+        var line = readme[i].replace(/^\s+/,"");
+        if(line.search(/^[\[\-]/) < 0) {
+          readme[i-1] += " " + line;
+          readme[i] = "";
+        }
+      }
+      readme = readme.filter(function(a){return a!="";});
+      // Condense log entries sepatated with newlines to one line for each version
+      for(var i=readme.length-1; i>0; --i) {
+        var line = readme[i].replace(/^\s+/,"");
+        if(line.search(/^[-~]/) < 0) {
+          readme[i-1] += "\n" + line;
+          readme[i] = "";
+        }
+      }
+      readme = readme.filter(function(a){return a!="";});
+      // Separate versions.
+      var history = {};
+      for(var i in readme) {
+        var line = readme[i].replace(/^[\sv-]+/g,"").trim();
+        var ver = line.substr(0, line.search(" ")).trim().toLowerCase();
+        var txt = line.substr(line.search(" ")).trim();
+        if(ver.search("~")===0) continue;
+        if(history[ver] !== undefined) throw new Error("Double definition of version '" + ver + "' in the readme version history.");
+        history[ver] = txt;
+      }
+      return history;
+    }
+    var history = read_history();
+    var latest_release = "";
+    var latest_beta = "";
+    for(var ver in history) { latest_beta=ver; break; }
+    for(var ver in history) if(ver.search(/(rc|b|a)/) < 0) { latest_release=ver; break; }
+    var update_json = {}
+    update_json["homepage"] = constants.project_download_inet_page();
+    update_json[mc_version] = history;
+    update_json["promos"] = {};
+    update_json["promos"][""+mc_version+"-recommended"] = latest_release;
+    update_json["promos"][""+mc_version+"-latest"] = latest_beta;
+    return update_json;
+  };
+
+  // Standard tasks
+  var stdtasks = {};
+
+  stdtasks["dist-check"] = function() {
+    var fails = me.tasks.dist_check();
+    if(fails.length == 0) return;
+    for(var i in fails) fails[i] = "  - " + fails[i];
+    alert("Dist check failed");
+    alert(fails.join("\n")+"\n");
+    exit(1);
+  };
+  stdtasks["version-check"] = function(args) {
+    var r = me.tasks.version_check(!args.join().search("--no-preversions")>=0);
+    if(r.fails.length == 0) return;
+    for(var i in r.fails) r.fails[i] = "  - " + r.fails[i];
+    alert("Version data:");
+    alert(" - version_mod       : '" + r.version_mod + "'");
+    alert(" - combined_version  : '" + r.combined_version + "'");
+    alert(" - version_forge     : '" + r.version_forge + "'");
+    if(!!r.preversion_found) alert(" - PREVERSION FOUND  : '~" + r.version_mod + "'");
+    exit(1);
+  };
+  stdtasks["version-html"] = function() {
+    if(!fs.isdir("dist")) throw new Error("'dist' directory does not exist.");
+    const hist = me.parsing.readme_history_section("readme.md");
+    const html = "
\n" + (hist.replace(/&/g, "&").replace(/>/g, ">").replace(/";
+    fs.writefile("dist/revision-history.html", html);
+  };
+  stdtasks["tabs-to-spaces"] = function() {
+    me.sanatizing.tabs_to_spaces(['java','lang']);
+  };
+  stdtasks["trailing-whitespaces"] = function() {
+    me.sanatizing.remove_trailing_whitespaces(['java','json','lang']);
+  };
+  stdtasks["sanatize"] = function() {
+    stdtasks["trailing-whitespaces"]();
+    stdtasks["tabs-to-spaces"]();
+  }
+  stdtasks["dist"] = function() {
+    stdtasks["version-html"]();
+  };
+  stdtasks["update-json"] = function() {
+    const version_minecraft = me.parsing.gradle_properties("gradle.properties").version_minecraft;
+    const json = me.tasks.changelog_data(version_minecraft);
+    fs.mkdir("./meta");
+    fs.writefile("./meta/update.json", JSON.stringify(json, null, 2));
+  };
+
+  stdtasks["dump-languages"] = function() {
+    const lang_version = (me.parsing.gradle_properties("gradle.properties").version_minecraft.search("1.12.")==0) ? "1.12" : "1.13";
+    const lang_extension = (lang_version == "1.12") ? ("lang") : ("json");
+    const liblang = include("../meta/lib/liblang."+lang_version+".js")(constants);
+    var lang_files = {};
+    fs.find("./src/main/resources/assets/"+ constants.mod_registry_name() +"/lang", '*.'+lang_extension, function(f){
+      const code = fs.basename(f).replace(/[\.].*$/,"").trim();
+      const data = liblang.load(f);
+      lang_files[code] = data;
+      return false;
+    });
+    print(JSON.stringify(lang_files,null,1));
+  };
+
+
+  /**
+   * Task main
+   */
+  me.run = function(tasks, args, no_std_tasks, rel_root_path) {
+    if(rel_root_path===undefined) rel_root_path = "..";
+    if(!fs.chdir(fs.dirname(fs.realpath(sys.script)))) throw new Error("Failed to switch to mod source directory.");
+    if(!fs.isdir(rel_root_path+"/.git")) throw new Error("Missing git repository in parent directory of mod source.");
+    if(!no_std_tasks) {
+      for(var key in stdtasks) {
+        if(tasks[key]===undefined) tasks[key] = stdtasks[key];
+      }
+    }
+    const task_name = args[0];
+    var task_args = args.slice(1).map(function(v){return(v===undefined)?(""):(""+v).trim()}).filter(function(v){return(v.length>0)});
+    if(task_name===undefined) {
+      alert("No task specified.");
+      exit(1);
+    } else if((tasks[task_name])===undefined) {
+      alert("No task '" + task_name + "' defined.");
+      exit(1);
+    } else {
+      tasks[task_name](task_args);
+    }
+  };
+
+  // Module include return value
+  Object.freeze(me.parsing);
+  Object.freeze(me.tasks);
+  Object.freeze(me);
+  return me;
+});
diff --git a/meta/update.json b/meta/update.json
index 501f647..b62e701 100644
--- a/meta/update.json
+++ b/meta/update.json
@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.12.2": {
+    "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).",
     "1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.",
     "1.0.8-b2": "[F] Config opt-out fixed (thx IronPiston for the report #30).\n[A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching).",
     "1.0.8-b1": "[A] Added \"Factory area\" sign.\n[M] Electrical furnace recipe changed (hoppers to conveyors).\n[A] Opt-out config options added.\n[F] Lang file fixes for en_us (Angela, PR#29).",
@@ -56,10 +57,18 @@
     "1.0.0-a2": "[A] Added panzer glass.",
     "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta."
   },
+  "1.14.2": {
+    "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.",
+    "1.0.7-b5": "[U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2.\n[A] Factory dropper functionality ported.\n[A] Small lab furnace functionality ported.\n[A] Small electrical lab furnace functionality ported.\n[A] Small waste incinerator functionality ported.\n[A] Fluid valves, Passive Fluid Accumulator ported.\n[I] Issue: Scoped recipe constants still not working.",
+    "1.0.7-b4": "[U] Updated to Forge BETA 1.14.2-26.0.32/20190608-1.14.2.\n[A] Sitting on the stool ported.\n[A] Ladder climbing speed boost ported.\n[A] Crafting table functionality ported.\n[I] Issue: Scoped recipe constants not working yet with the current Forge version (or somehow changed).",
+    "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
+  },
   "promos": {
     "1.12.2-recommended": "1.0.8",
-    "1.12.2-latest": "1.0.8",
+    "1.12.2-latest": "1.0.9-b1",
     "1.13.2-recommended": "",
-    "1.13.2-latest": "1.0.7-b4"
+    "1.13.2-latest": "1.0.7-b4",
+    "1.14.2-recommended": "",
+    "1.14.2-latest": "1.0.8-b1"
   }
 }
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 7ac5ed3..ff5681f 100644
--- a/readme.md
+++ b/readme.md
@@ -145,6 +145,10 @@ More to come slowly but steadily.
   - Bug reports: Yes, please let me know. Drop a mail or better open an issue
     for the repository.
 
+  - Translations: Please translate the 1.12 lang files if possible (because the
+    1.13+ JSON language files are automatically generated from these `.lang`
+    files - saves me a bit of work).
+
   - Pull requests: Happily accepted. Please make sure that use the ***develop
     branch*** for pull requests. The master branch is for release versions only.
     I might merge the pull request locally if I'm ahead of the github repository,
@@ -154,7 +158,7 @@ More to come slowly but steadily.
     blocks under development to be registered as well.
 
 ----
-## Revision history
+## Version history
 
 Mod versions are tracked in the readme files for individual Minecraft versions, and
 of course in the commits of this repository. Beta and release versions that are
@@ -166,6 +170,8 @@ commits.
 
   - [1.13](1.13/readme.md)
 
+  - [1.14](1.14/readme.md)
+
 ### Community references
 
 Mods covering similar features, or may fit well together with IE and the decorations of this mod:
diff --git a/tasks.js b/tasks.js
index 37a0ebc..c4a053a 100644
--- a/tasks.js
+++ b/tasks.js
@@ -1,26 +1,32 @@
 #!/usr/bin/djs
 "use strict";
 // Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod.
-const config_main_repo = fs.realpath("../engineersdecor-github");
-if(!fs.chdir(fs.dirname(fs.realpath(sys.script)))) throw new Error("Failed to switch to mod repository base directory.");
-if(!fs.isdir(".git")) throw new Error("Missing git repository in mod repository base directory.");
+const constants = include("meta/lib/constants.js")();
+const libtask = include("meta/lib/libtask.js")(constants);
+const libassets = include("meta/lib/libassets.js")(constants);
+const modid = constants.mod_registry_name();
+const with_113 = false;
 var tasks = {};
 
 tasks["update-json"] = function() {
   const root_dir = fs.realpath(fs.dirname(sys.script));
   var update_jsons = {
     "1.12.2": JSON.parse(fs.readfile(root_dir + "/1.12/meta/update.json")),
-    "1.13.2": JSON.parse(fs.readfile(root_dir + "/1.13/meta/update.json"))
+    "1.13.2": JSON.parse(fs.readfile(root_dir + "/1.13/meta/update.json")),
+    "1.14.2": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json"))
   };
   var update_json = {
     homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
     "1.12.2": update_jsons["1.12.2"]["1.12.2"],
     "1.13.2": update_jsons["1.13.2"]["1.13.2"],
+    "1.14.2": update_jsons["1.14.2"]["1.14.2"],
     promos: {
       "1.12.2-recommended": update_jsons["1.12.2"]["promos"]["1.12.2-recommended"],
       "1.12.2-latest": update_jsons["1.12.2"]["promos"]["1.12.2-latest"],
       "1.13.2-recommended": update_jsons["1.13.2"]["promos"]["1.13.2-recommended"],
       "1.13.2-latest": update_jsons["1.13.2"]["promos"]["1.13.2-latest"],
+      "1.14.2-recommended": update_jsons["1.14.2"]["promos"]["1.14.2-recommended"],
+      "1.14.2-latest": update_jsons["1.14.2"]["promos"]["1.14.2-latest"]
     }
   }
   fs.mkdir(root_dir + "/meta");
@@ -33,7 +39,7 @@ tasks["sync-main-repository"] = function() {
   if(sys.shell("git remote -v") != "") throw new Error("Dev repository has a remote set.");
   if(main_repo_local == "") throw new Error("Main repository (real) path not found.");
   const test_repo_local = fs.cwd();
-  const main_repo_local = fs.realpath(config_main_repo);
+  const main_repo_local = fs.realpath("../engineersdecor-github");
   if(main_repo_local == fs.realpath(test_repo_local)) throw new Error("This is already the main repository");
   const cd_dev = function(subdir) {
     if((!fs.chdir(test_repo_local)) || (!fs.isdir(".git"))) throw new Error("Failed to switch to mod source directory.");
@@ -65,10 +71,83 @@ tasks["sync-main-repository"] = function() {
   print(sys.shell("git status -s"))
 };
 
-const task_name = sys.args[0];
-if((task_name===undefined) || (tasks[task_name])===undefined) {
-  alert("No task ", task_name);
-  exit(1);
-} else {
-  tasks[task_name]();
+tasks["compare-textures"] = function(args) {
+  if(args.length==0) args.push("");
+  // const verbose = (args.find("-v")) || (args.find("--verbose"));   //// NO ARRAY.FIND???? --> fix in JS engine
+  const verbose = (args[0]=="-v") || (args[0]=="-verbose");   //// NO ARRAY.FIND???? --> fix in JS engine
+  function compare(va, vb) {
+    const cmp = libassets.compare_textures(
+      va+"/src/main/resources/assets",
+      vb+"/src/main/resources/assets"
+    );
+    const n_diff = Object.keys(cmp.differ).length;
+    const n_match = Object.keys(cmp.match).length;
+    const n_onlya = Object.keys(cmp.onlyin_a).length;
+    const n_onlyb = Object.keys(cmp.onlyin_b).length;
+    if(!verbose) {
+      if((n_diff==0) && (n_onlya==0) && (n_onlyb==0)) return true;
+      print("[warn] Textures of " + va + "<->" + vb + " differ: " + n_match + " matching, " + n_diff +
+                    " different, " + n_onlya + " only in " + va + ", " + n_onlyb + " only in " + vb +
+                    ". (--verbose for details)");
+      return false;
+    } else {
+      if((n_diff==0) && (n_onlya==0) && (n_onlyb==0)) {
+        print("[pass] Textures of " + va + "<->" + vb + " all match.");
+        return true;
+      }
+      for(var key in cmp.differ) {
+        print("[warn] Texture of " + va + "<->" + vb + " differs: '" + key + "'.");
+      }
+      for(var key in cmp.onlyin_a) {
+        print("[warn] Texture only in " + va + ": '" + key + "'.");
+      }
+      for(var key in cmp.onlyin_b) {
+        print("[warn] Texture only in " + vb + ": '" + key + "'.");
+      }
+      return false;
+    }
+  }
+  var ok = true;
+  if(with_113 && !compare("1.12", "1.13")) ok = false;
+  if(!compare("1.12", "1.14")) ok = false;
+  return ok;
+};
+
+tasks["migrate-textures"] = function(args) {
+  if(args.length==0) args.push("");
+  const verbose = (args[0]=="-v") || (args[0]=="-verbose");
+  throw new Error("Migration is WIP");
 }
+
+tasks["compare-blockstates"] = function(args) {
+  if(args.length==0) args.push("");
+  const verbose = (args[0]=="-v") || (args[0]=="-verbose");
+  const compare = function(va, vb) {
+    const cmp = libassets.compare_blockstates(va+"/src/main/resources/assets/"+modid, vb+"/src/main/resources/assets/"+modid);
+    const n_onlya = Object.keys(cmp.onlyin_a).length;
+    const n_onlyb = Object.keys(cmp.onlyin_b).length;
+    if(!verbose) {
+      if((n_onlya==0) && (n_onlyb==0)) return true;
+      print("[warn] Block states of " + va + "<->" + vb + " differ: " + n_onlya + " only in " + va + ", " + n_onlyb + " only in " + vb + ". (--verbose for details)");
+      return false;
+    } else {
+      if((n_onlya==0) && (n_onlyb==0)) {
+        print("[pass] Block states of " + va + "<->" + vb + " all match.");
+        return true;
+      }
+      for(var key in cmp.onlyin_a) {
+        print("[warn] Block states only in " + va + ", not " + vb + ": '" + key + "'.");
+      }
+      for(var key in cmp.onlyin_b) {
+        print("[warn] Block states only in " + vb + ", not " + va + ": '" + key + "'.");
+      }
+      return false;
+    }
+  }
+  var ok = true;
+  if(with_113 && !compare("1.12", "1.13")) ok = false;
+  if(!compare("1.12", "1.14")) ok = false;
+  return ok;
+};
+
+libtask.run(tasks, sys.args, true, ".");

From 792bdce3e1cc305445344d1207c4f55893530f73 Mon Sep 17 00:00:00 2001
From: stfwi 
Date: Sun, 23 Jun 2019 16:04:55 +0200
Subject: [PATCH 05/14] Fixed furnace init issue. Prepared slabs with texture
 variations for testing.

---
 1.12/gradle.properties                        |   2 +-
 1.12/readme.md                                |   6 +
 .../blocks/BlockDecorFurnace.java             |  38 ++--
 .../blocks/BlockDecorFurnaceElectrical.java   |  12 +-
 .../blocks/BlockDecorHalfSlab.java            |  21 +-
 .../engineersdecor/blocks/BlockDecorSlab.java | 201 ++++++++++++++++++
 .../wile/engineersdecor/blocks/ModBlocks.java |  27 ++-
 .../wile/engineersdecor/detail/ModConfig.java |  11 +
 .../blockstates/clinker_brick_slab.json       |  26 +++
 .../clinker_brick_stained_slab.json           |  26 +++
 .../blockstates/panzerglass_slab.json         |  26 +++
 .../blockstates/rebar_concrete_slab.json      |  26 +++
 .../blockstates/rebar_concrete_tile_slab.json |  26 +++
 .../blockstates/slag_brick_slab.json          |  26 +++
 .../assets/engineersdecor/lang/en_us.lang     |  15 +-
 .../assets/engineersdecor/lang/ru_ru.lang     |  15 +-
 .../assets/engineersdecor/lang/zh_cn.lang     |  15 +-
 .../models/block/slab/halfslab_s0_model.json  |   9 +-
 .../models/block/slab/halfslab_s1_model.json  |   9 +-
 .../models/block/slab/halfslab_s2_model.json  |   9 +-
 .../models/block/slab/halfslab_s3_model.json  |   9 +-
 .../models/block/slab/halfslab_s4_model.json  |   9 +-
 .../models/block/slab/halfslab_s5_model.json  |   9 +-
 .../models/block/slab/halfslab_s6_model.json  |   9 +-
 .../models/block/slab/halfslab_s7_model.json  |   9 +-
 .../models/block/slab/halfslab_s8_model.json  |   9 +-
 .../models/block/slab/halfslab_s9_model.json  |   9 +-
 .../models/block/slab/halfslab_sa_model.json  |   9 +-
 .../models/block/slab/halfslab_sb_model.json  |   9 +-
 .../models/block/slab/halfslab_sc_model.json  |   9 +-
 .../models/block/slab/halfslab_sd_model.json  |   9 +-
 .../models/block/slab/halfslab_se_model.json  |   9 +-
 .../models/block/slab/slab_s0_model.json      |   8 +
 .../models/block/slab/slab_s1_model.json      |   8 +
 .../models/block/slab/slab_s2_model.json      |   8 +
 35 files changed, 586 insertions(+), 92 deletions(-)
 create mode 100644 1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorSlab.java
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_slab.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_slab.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/panzerglass_slab.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_slab.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_tile_slab.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/slag_brick_slab.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s0_model.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s1_model.json
 create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s2_model.json

diff --git a/1.12/gradle.properties b/1.12/gradle.properties
index ee11ec5..d996b7a 100644
--- a/1.12/gradle.properties
+++ b/1.12/gradle.properties
@@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.12.2
 version_forge=14.23.5.2768
 version_jei=4.10.0.198
-version_engineersdecor=1.0.9-b1
+version_engineersdecor=1.0.9-b2
diff --git a/1.12/readme.md b/1.12/readme.md
index 9272019..3aa7814 100644
--- a/1.12/readme.md
+++ b/1.12/readme.md
@@ -10,6 +10,12 @@ Mod sources for Minecraft version 1.12.2.
 ----
 ## Version history
 
+    ~ v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete,
+                    and Stained Clinker. Texture variations like the base blocks.
+                    Allow fast pick-up (see tooltip help or config).
+                [F] Fixed lab/electrical furnace initialisation issue (first item
+                    inserted was smelted directly).
+
     - v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167).
                 [M] Block hardness adaptions (issue #32).
 
diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java
index ce61559..7ffe43d 100644
--- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java
+++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java
@@ -465,6 +465,7 @@ public class BlockDecorFurnace extends BlockDecorDirected
     private int proc_time_needed_;
     private int boost_energy_; // small, not saved in nbt.
     private boolean heater_inserted_ = false;
+    protected ItemStack current_smelting_input_stack_ = ItemStack.EMPTY;
     protected NonNullList stacks_;
 
     public static void on_config(int speed_percent, int fuel_efficiency_percent, int boost_energy_per_tick)
@@ -482,10 +483,11 @@ public class BlockDecorFurnace extends BlockDecorDirected
     protected void reset()
     {
       stacks_ = NonNullList.withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
+      current_smelting_input_stack_ = ItemStack.EMPTY;
       proc_time_elapsed_ = 0;
       proc_time_needed_ = 0;
       burntime_left_ = 0;
-      fuel_burntime_ = 0;
+      fuel_burntime_ = -1;
       fifo_timer_ = 0;
       tick_timer_ = 0;
     }
@@ -496,16 +498,17 @@ public class BlockDecorFurnace extends BlockDecorDirected
       ItemStackHelper.loadAllItems(compound, this.stacks_);
       while(this.stacks_.size() < NUM_OF_SLOTS) this.stacks_.add(ItemStack.EMPTY);
       burntime_left_ = compound.getInteger("BurnTime");
-      proc_time_elapsed_ = compound.getInteger("CookTime");
-      proc_time_needed_ = compound.getInteger("CookTimeTotal");
-      fuel_burntime_ = getItemBurnTime(stacks_.get(SMELTING_FUEL_SLOT_NO));
+      proc_time_needed_ = MathHelper.clamp(compound.getInteger("CookTimeTotal"), 10, 65535);
+      proc_time_elapsed_ = MathHelper.clamp(compound.getInteger("CookTime"), 0, proc_time_needed_);
+      fuel_burntime_ = compound.getInteger("FuelBurnTime");
     }
 
     protected void writenbt(NBTTagCompound compound)
     {
       compound.setInteger("BurnTime", MathHelper.clamp(burntime_left_,0 , MAX_BURNTIME));
       compound.setInteger("CookTime", MathHelper.clamp(proc_time_elapsed_, 0, MAX_BURNTIME));
-      compound.setInteger("CookTimeTotal", MathHelper.clamp(proc_time_needed_, 0, MAX_BURNTIME));
+      compound.setInteger("CookTimeTotal", MathHelper.clamp(proc_time_needed_, 10, MAX_BURNTIME));
+      compound.setInteger("FuelBurnTime", MathHelper.clamp(fuel_burntime_, 0, MAX_BURNTIME));
       ItemStackHelper.saveAllItems(compound, stacks_);
     }
 
@@ -688,8 +691,9 @@ public class BlockDecorFurnace extends BlockDecorDirected
 
     protected boolean canSmelt()
     {
-      if(stacks_.get(SMELTING_INPUT_SLOT_NO).isEmpty()) return false;
-      final ItemStack recipe_result_items = BRecipes.instance().getSmeltingResult(stacks_.get(SMELTING_INPUT_SLOT_NO));
+      final ItemStack in_stack = stacks_.get(SMELTING_INPUT_SLOT_NO);
+      if(in_stack.isEmpty()) return false;
+      final ItemStack recipe_result_items = BRecipes.instance().getSmeltingResult(in_stack);
       if(recipe_result_items.isEmpty()) return false;
       final ItemStack result_stack = stacks_.get(SMELTING_OUTPUT_SLOT_NO);
       if(result_stack.isEmpty()) return true;
@@ -807,6 +811,7 @@ public class BlockDecorFurnace extends BlockDecorDirected
       tick_timer_ = TICK_INTERVAL;
       final boolean was_burning = isBurning();
       if(was_burning) burntime_left_ -= TICK_INTERVAL;
+      if(fuel_burntime_ < 0) fuel_burntime_ = getItemBurnTime(stacks_.get(SMELTING_FUEL_SLOT_NO));
       if(burntime_left_ < 0) burntime_left_ = 0;
       if(world.isRemote) return;
       boolean dirty = false;
@@ -823,9 +828,16 @@ public class BlockDecorFurnace extends BlockDecorDirected
           || (stacks_.get(AUX_0_SLOT_NO).getItem()==ExtItems.IE_EXTERNAL_HEATER)
           || (stacks_.get(AUX_1_SLOT_NO).getItem()==ExtItems.IE_EXTERNAL_HEATER);
       }
-      ItemStack fuel = stacks_.get(SMELTING_FUEL_SLOT_NO);
-      if(isBurning() || (!fuel.isEmpty()) && (!(stacks_.get(SMELTING_INPUT_SLOT_NO)).isEmpty())) {
-        if(!isBurning() && canSmelt()) {
+      final ItemStack fuel = stacks_.get(SMELTING_FUEL_SLOT_NO);
+      final ItemStack last_inp_stack = current_smelting_input_stack_;
+      current_smelting_input_stack_ = stacks_.get(SMELTING_INPUT_SLOT_NO);
+      if(isBurning() || (!fuel.isEmpty()) && (!current_smelting_input_stack_.isEmpty())) {
+        if(!current_smelting_input_stack_.isItemEqual(last_inp_stack)) {
+          proc_time_elapsed_ = 0;
+          proc_time_needed_ = getCookTime(current_smelting_input_stack_);
+        }
+        final boolean can_smelt = canSmelt();
+        if(can_smelt && (burntime_left_ <= 0)) { // Refuel
           burntime_left_ = (int)MathHelper.clamp((proc_fuel_efficiency_ * getItemBurnTime(fuel)), 0, MAX_BURNTIME);
           fuel_burntime_ = (burntime_left_ * proc_speed_interval_) / VANILLA_FURNACE_SPEED_INTERVAL;
           if(isBurning()) {
@@ -837,17 +849,17 @@ public class BlockDecorFurnace extends BlockDecorDirected
             }
           }
         }
-        if(isBurning() && canSmelt()) {
+        if((burntime_left_ > 0) && can_smelt) { // Smelting process
           proc_time_elapsed_ += TICK_INTERVAL;
           if(heater_inserted_ && (boost_energy_ >= boost_energy_consumption)) { boost_energy_ = 0; proc_time_elapsed_ += TICK_INTERVAL; }
           if(proc_time_elapsed_ >= proc_time_needed_) {
             proc_time_elapsed_ = 0;
-            proc_time_needed_ = getCookTime(stacks_.get(SMELTING_INPUT_SLOT_NO));
+            proc_time_needed_ = getCookTime(current_smelting_input_stack_);
             smeltItem();
             dirty = true;
           }
         } else {
-          proc_time_elapsed_ = 0;
+          proc_time_elapsed_ = MathHelper.clamp(proc_time_elapsed_-2, 0, proc_time_needed_);
         }
       } else if(!isBurning() && (proc_time_elapsed_ > 0)) {
         proc_time_elapsed_ = MathHelper.clamp(proc_time_elapsed_-2, 0, proc_time_needed_);
diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java
index e73ff59..a10f9a3 100644
--- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java
+++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java
@@ -682,9 +682,15 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace
         if(transferItems(FIFO_INPUT_0_SLOT_NO, SMELTING_INPUT_SLOT_NO, 64)) dirty = true;
         if(transferItems(FIFO_INPUT_1_SLOT_NO, FIFO_INPUT_0_SLOT_NO, 64)) { dirty = true; } else { shift_in = true; }
       }
-      if((!(stacks_.get(SMELTING_INPUT_SLOT_NO)).isEmpty()) && (energy_stored_ >= energy_consumption_)) {
+      final ItemStack last_inp_stack = current_smelting_input_stack_;
+      current_smelting_input_stack_ = stacks_.get(SMELTING_INPUT_SLOT_NO);
+      if((!current_smelting_input_stack_.isEmpty()) && (energy_stored_ >= energy_consumption_)) {
+        if(!current_smelting_input_stack_.isItemEqual(current_smelting_input_stack_)) {
+          proc_time_elapsed_ = 0;
+          proc_time_needed_ = getCookTime(current_smelting_input_stack_);
+        }
         final boolean can_smelt = canSmelt();
-        if((!can_smelt) && (BRecipes.instance().getSmeltingResult(stacks_.get(SMELTING_INPUT_SLOT_NO)).isEmpty())) {
+        if((!can_smelt) && (BRecipes.instance().getSmeltingResult(current_smelting_input_stack_).isEmpty())) {
           // bypass
           if(transferItems(SMELTING_INPUT_SLOT_NO, SMELTING_OUTPUT_SLOT_NO, 1)) dirty = true;
         } else {
@@ -697,7 +703,7 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace
             proc_time_elapsed_ += (TICK_INTERVAL * proc_speed_percent_/100);
             if(proc_time_elapsed_ >= proc_time_needed_) {
               proc_time_elapsed_ = 0;
-              proc_time_needed_ = getCookTime(stacks_.get(SMELTING_INPUT_SLOT_NO));
+              proc_time_needed_ = getCookTime(current_smelting_input_stack_);
               smeltItem();
               dirty = true;
               shift_out = true;
diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java
index 879012e..0715551 100644
--- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java
+++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java
@@ -4,10 +4,13 @@
  * @copyright (C) 2019 Stefan Wilhelm
  * @license MIT (see https://opensource.org/licenses/MIT)
  *
- * Half slab characteristics class.
+ * Half slab ("slab slices") characteristics class. Actually
+ * it's now a quater slab, but who cares.
  */
 package wile.engineersdecor.blocks;
 
+import wile.engineersdecor.detail.ModAuxiliaries;
+import wile.engineersdecor.detail.ModConfig;
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
@@ -26,15 +29,17 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.List;
 
 
 public class BlockDecorHalfSlab extends BlockDecor
@@ -61,6 +66,16 @@ public class BlockDecorHalfSlab extends BlockDecor
   protected boolean is_cube(IBlockState state)
   { return state.getValue(PARTS) == 0x07; }
 
+  @Override
+  @SideOnly(Side.CLIENT)
+  public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag)
+  {
+    if(!ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true)) return;
+    if(!ModConfig.optout.without_direct_slab_pickup) {
+      ModAuxiliaries.Tooltip.addInformation("engineersdecor.tooltip.slabpickup", "engineersdecor.tooltip.slabpickup", tooltip, flag, true);
+    }
+  }
+
   @Override
   @SideOnly(Side.CLIENT)
   public BlockRenderLayer getRenderLayer()
@@ -167,7 +182,7 @@ public class BlockDecorHalfSlab extends BlockDecor
   @Override
   public void onBlockClicked(World world, BlockPos pos, EntityPlayer player)
   {
-    if(world.isRemote) return;
+    if((world.isRemote) || (ModConfig.optout.without_direct_slab_pickup)) return;
     final ItemStack stack = player.getHeldItemMainhand();
     if(stack.isEmpty() || (Block.getBlockFromItem(stack.getItem()) != this)) return;
     if(stack.getCount() >= stack.getMaxStackSize()) return;
diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorSlab.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorSlab.java
new file mode 100644
index 0000000..bcf2ae9
--- /dev/null
+++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorSlab.java
@@ -0,0 +1,201 @@
+/*
+ * @file BlockDecorSlab.java
+ * @author Stefan Wilhelm (wile)
+ * @copyright (C) 2019 Stefan Wilhelm
+ * @license MIT (see https://opensource.org/licenses/MIT)
+ *
+ * Standard half block horizontal slab characteristics class.
+ */
+package wile.engineersdecor.blocks;
+
+import wile.engineersdecor.detail.ModAuxiliaries;
+import wile.engineersdecor.detail.ModConfig;
+import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockFaceShape;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+
+
+public class BlockDecorSlab extends BlockDecor
+{
+  public static final PropertyInteger PARTS = PropertyInteger.create("parts", 0, 2);
+  public static final PropertyInteger TEXTURE_VARIANT = PropertyInteger.create("tvariant", 0, 7);
+
+  protected static final AxisAlignedBB AABBs[] = {
+    new AxisAlignedBB(0,  0./16, 0, 1,  8./16, 1), // bottom slab
+    new AxisAlignedBB(0,  8./16, 0, 1, 16./16, 1), // top slab
+    new AxisAlignedBB(0,  0./16, 0, 1, 16./16, 1), // both slabs
+    new AxisAlignedBB(0,  0./16, 0, 1, 16./16, 1)  // << 2bit fill
+  };
+  protected static final int num_slabs_contained_in_parts_[] = { 1,1,2,2 };
+
+  public BlockDecorSlab(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound)
+  { super(registryName, config, material, hardness, resistance, sound); }
+
+  protected boolean is_cube(IBlockState state)
+  { return state.getValue(PARTS) >= 2; }
+
+  @Override
+  @SideOnly(Side.CLIENT)
+  public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag)
+  {
+    if(!ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true)) return;
+    if(!ModConfig.optout.without_direct_slab_pickup) {
+      ModAuxiliaries.Tooltip.addInformation("engineersdecor.tooltip.slabpickup", "engineersdecor.tooltip.slabpickup", tooltip, flag, true);
+    }
+  }
+
+  @Override
+  @SideOnly(Side.CLIENT)
+  public BlockRenderLayer getRenderLayer()
+  { return (((config & CFG_TRANSLUCENT)!=0) ? (BlockRenderLayer.TRANSLUCENT) : (BlockRenderLayer.CUTOUT)); }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public IBlockState getStateFromMeta(int meta)
+  { return getDefaultState().withProperty(PARTS, MathHelper.clamp(meta, 0, 2)); }
+
+  @Override
+  public int getMetaFromState(IBlockState state)
+  { return state.getValue(PARTS); }
+
+  @Override
+  public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
+  {
+    long prnd = pos.toLong(); prnd = (prnd>>29) ^ (prnd>>17) ^ (prnd>>9) ^ (prnd>>4) ^ pos.getX() ^ pos.getY() ^ pos.getZ();
+    return state.withProperty(TEXTURE_VARIANT, ((int)prnd) & 0x7);
+  }
+
+  @Override
+  protected BlockStateContainer createBlockState()
+  { return new BlockStateContainer(this, PARTS, TEXTURE_VARIANT); }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public boolean isOpaqueCube(IBlockState state)
+  { return ((config & CFG_TRANSLUCENT)==0) && is_cube(state); }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face)
+  { return (state.getValue(PARTS) >= 2) ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos)
+  { return AABBs[state.getValue(PARTS) & 0x3]; }
+
+  @Override
+  @Nullable
+  public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
+  { return getBoundingBox(state, world, pos); }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public boolean isFullCube(IBlockState state)
+  { return is_cube(state); }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public boolean isNormalCube(IBlockState state)
+  { return is_cube(state); }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public boolean canEntitySpawn(IBlockState state, Entity entity)
+  { return false; }
+
+  @Override
+  public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack)
+  { spawnAsEntity(world, pos, new ItemStack(Item.getItemFromBlock(this), num_slabs_contained_in_parts_[state.getValue(PARTS) & 0x3])); }
+
+  @Override
+  public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side)
+  { return world.getBlockState(pos).getBlock() != this; }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  { return getDefaultState().withProperty(PARTS, ((facing==EnumFacing.UP) || ((facing!=EnumFacing.DOWN) && (hitY < 0.6))) ? 0 : 1); }
+
+  @Override
+  public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
+  {
+    final ItemStack stack = player.getHeldItem(hand);
+    if(stack.isEmpty() || (Block.getBlockFromItem(stack.getItem()) != this)) return false;
+    int parts = state.getValue(PARTS);
+    if(((facing == EnumFacing.UP) && (parts == 0)) || ((facing == EnumFacing.DOWN) && (parts == 1))) {
+      world.setBlockState(pos, state.withProperty(PARTS, 2), 3);
+    } else {
+      return false; // "not handled" -> let parent decide if a new slab has to be placed on top/bottom.
+    }
+    if(world.isRemote) return true;
+    if(!player.isCreative()) {
+      stack.shrink(1);
+      if(player.inventory != null) player.inventory.markDirty();
+    }
+    SoundType st = this.getSoundType(state, world, pos, null);
+    world.playSound(null, pos, st.getPlaceSound(), SoundCategory.BLOCKS, (st.getVolume()+1f)/2.5f, 0.9f*st.getPitch());
+    return true;
+  }
+
+  @Override
+  public void onBlockClicked(World world, BlockPos pos, EntityPlayer player)
+  {
+    if((world.isRemote) || (ModConfig.optout.without_direct_slab_pickup)) return;
+    final ItemStack stack = player.getHeldItemMainhand();
+    if(stack.isEmpty() || (Block.getBlockFromItem(stack.getItem()) != this)) return;
+    if(stack.getCount() >= stack.getMaxStackSize()) return;
+    Vec3d lv = player.getLookVec();
+    EnumFacing facing = EnumFacing.getFacingFromVector((float)lv.x, (float)lv.y, (float)lv.z);
+    if((facing != EnumFacing.UP) && (facing != EnumFacing.DOWN)) return;
+    IBlockState state = world.getBlockState(pos);
+    if(state.getBlock() != this) return;
+    int parts = state.getValue(PARTS);
+    if(facing == EnumFacing.DOWN) {
+      if(parts == 2) {
+        world.setBlockState(pos, state.withProperty(PARTS, 0), 3);
+      } else {
+        world.setBlockToAir(pos);
+      }
+    } else if(facing == EnumFacing.UP) {
+      if(parts == 2) {
+        world.setBlockState(pos, state.withProperty(PARTS, 1), 3);
+      } else {
+        world.setBlockToAir(pos);
+      }
+    }
+    if(!player.isCreative()) {
+      stack.grow(1);
+      if(player.inventory != null) player.inventory.markDirty(); // @todo: check if inventory can actually be null
+    }
+    SoundType st = this.getSoundType(state, world, pos, null);
+    world.playSound(player, pos, st.getPlaceSound(), SoundCategory.BLOCKS, (st.getVolume()+1f)/2.5f, 0.9f*st.getPitch());
+  }
+}
diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java
index 3b6a90b..ba759be 100644
--- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java
+++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java
@@ -44,19 +44,25 @@ public class ModBlocks
   public static final BlockDecorFull CLINKER_BRICK_BLOCK = new BlockDecorFull("clinker_brick_block", 0, Material.ROCK, 2f, 15f, SoundType.STONE);
   public static final BlockDecorStairs CLINKER_BRICK_STAIRS = new BlockDecorStairs("clinker_brick_stairs", CLINKER_BRICK_BLOCK.getDefaultState());
   public static final BlockDecorWall CLINKER_BRICK_WALL = new BlockDecorWall("clinker_brick_wall", BlockDecor.CFG_DEFAULT, Material.ROCK, 2f, 20f, SoundType.STONE);
+  public static final BlockDecorSlab CLINKER_BRICK_SLAB = new BlockDecorSlab("clinker_brick_slab", BlockDecor.CFG_DEFAULT, Material.ROCK, 2f, 20f, SoundType.STONE);
 
   public static final BlockDecorFull CLINKER_BRICK_STAINED_BLOCK = new BlockDecorFull("clinker_brick_stained_block", 0, Material.ROCK, 2f, 15f, SoundType.STONE);
   public static final BlockDecorStairs CLINKER_BRICK_STAINED_STAIRS = new BlockDecorStairs("clinker_brick_stained_stairs", CLINKER_BRICK_STAINED_BLOCK.getDefaultState());
+  public static final BlockDecorSlab CLINKER_BRICK_STAINED_SLAB = new BlockDecorSlab("clinker_brick_stained_slab", BlockDecor.CFG_DEFAULT, Material.ROCK, 2f, 20f, SoundType.STONE);
 
   public static final BlockDecorFull SLAG_BRICK_BLOCK  = new BlockDecorFull("slag_brick_block", 0, Material.ROCK, 2f, 15f, SoundType.STONE);
   public static final BlockDecorStairs SLAG_BRICK_STAIRS = new BlockDecorStairs("slag_brick_stairs", SLAG_BRICK_BLOCK.getDefaultState());
   public static final BlockDecorWall SLAG_BRICK_WALL = new BlockDecorWall("slag_brick_wall", BlockDecor.CFG_DEFAULT, Material.ROCK, 2f, 15f, SoundType.STONE);
+  public static final BlockDecorSlab SLAG_BRICK_SLAB = new BlockDecorSlab("slag_brick_slab", BlockDecor.CFG_DEFAULT, Material.ROCK, 2f, 15f, SoundType.STONE);
 
   public static final BlockDecorFull REBAR_CONCRETE_BLOCK = new BlockDecorFull("rebar_concrete", 0, Material.ROCK, 5f, 2000f, SoundType.STONE);
   public static final BlockDecorStairs REBAR_CONCRETE_STAIRS = new BlockDecorStairs("rebar_concrete_stairs", REBAR_CONCRETE_BLOCK.getDefaultState());
   public static final BlockDecorWall REBAR_CONCRETE_WALL = new BlockDecorWall("rebar_concrete_wall", BlockDecor.CFG_DEFAULT, Material.ROCK, 5f, 2000f, SoundType.STONE);
+  public static final BlockDecorSlab REBAR_CONCRETE_SLAB = new BlockDecorSlab("rebar_concrete_slab", BlockDecor.CFG_DEFAULT, Material.ROCK, 5f, 2000f, SoundType.STONE);
+
   public static final BlockDecorFull REBAR_CONCRETE_TILE = new BlockDecorFull("rebar_concrete_tile", 0, Material.ROCK, 5f, 2000f, SoundType.STONE);
   public static final BlockDecorStairs REBAR_CONCRETE_TILE_STAIRS = new BlockDecorStairs("rebar_concrete_tile_stairs", REBAR_CONCRETE_TILE.getDefaultState());
+  public static final BlockDecorSlab REBAR_CONCRETE_TILE_SLAB = new BlockDecorSlab("rebar_concrete_tile_slab", BlockDecor.CFG_DEFAULT, Material.ROCK, 5f, 2000f, SoundType.STONE);
 
   public static final BlockDecorWall CONCRETE_WALL = new BlockDecorWall("concrete_wall", BlockDecor.CFG_DEFAULT, Material.ROCK, 5f, 20f, SoundType.STONE);
 
@@ -64,7 +70,9 @@ public class ModBlocks
   public static final BlockDecorLadder METAL_RUNG_STEPS = new BlockDecorLadder("metal_rung_steps", 0, Material.IRON, 0.5f, 20f, SoundType.METAL);
   public static final BlockDecorLadder TREATED_WOOD_LADDER = new BlockDecorLadder("treated_wood_ladder", 0, Material.WOOD, 0.5f, 10f, SoundType.WOOD);
 
-  public static final BlockDecorGlassBlock PANZERGLASS_BLOCK = new BlockDecorGlassBlock("panzerglass_block", 0, Material.GLASS, 0.8f, 2000f, SoundType.GLASS);
+  public static final BlockDecorGlassBlock PANZERGLASS_BLOCK = new BlockDecorGlassBlock("panzerglass_block", 0, Material.GLASS, 1f, 2000f, SoundType.GLASS);
+  public static final BlockDecorSlab PANZERGLASS_SLAB = new BlockDecorSlab("panzerglass_slab", BlockDecor.CFG_TRANSLUCENT, Material.GLASS, 1f, 2000f, SoundType.GLASS);
+
 
   public static final BlockDecorStraightPole TREATED_WOOD_POLE = new BlockDecorStraightPole(
     "treated_wood_pole",
@@ -361,17 +369,22 @@ public class ModBlocks
     STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI,
     PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI,
     CLINKER_BRICK_BLOCK,
+    CLINKER_BRICK_SLAB,
     CLINKER_BRICK_STAIRS,
     CLINKER_BRICK_WALL,
     CLINKER_BRICK_STAINED_BLOCK,
+    CLINKER_BRICK_STAINED_SLAB,
     CLINKER_BRICK_STAINED_STAIRS,
     SLAG_BRICK_BLOCK,
+    SLAG_BRICK_SLAB,
     SLAG_BRICK_STAIRS,
     SLAG_BRICK_WALL,
     REBAR_CONCRETE_BLOCK,
+    REBAR_CONCRETE_SLAB,
     REBAR_CONCRETE_STAIRS,
     REBAR_CONCRETE_WALL,
     REBAR_CONCRETE_TILE,
+    REBAR_CONCRETE_TILE_SLAB,
     REBAR_CONCRETE_TILE_STAIRS,
     CONCRETE_WALL,
     PANZERGLASS_BLOCK,
@@ -397,15 +410,11 @@ public class ModBlocks
 
   private static final Object dev_content[] = {
     SIGN_MINDSTEP,
+    PANZERGLASS_SLAB, // check if another class is needed due to is_side_visible
     // handling not sure yet ...
-    HALFSLAB_REBARCONCRETE,
-    HALFSLAB_CONCRETE,
-    HALFSLAB_TREATEDWOOD,
-    HALFSLAB_SHEETMETALIRON,
-    HALFSLAB_SHEETMETALSTEEL,
-    HALFSLAB_SHEETMETALCOPPER,
-    HALFSLAB_SHEETMETALGOLD,
-    HALFSLAB_SHEETMETALALUMINIUM,
+    HALFSLAB_REBARCONCRETE, HALFSLAB_CONCRETE, HALFSLAB_TREATEDWOOD,
+    HALFSLAB_SHEETMETALIRON, HALFSLAB_SHEETMETALSTEEL, HALFSLAB_SHEETMETALCOPPER,
+    HALFSLAB_SHEETMETALGOLD, HALFSLAB_SHEETMETALALUMINIUM,
   };
 
   //--------------------------------------------------------------------------------------------------------------------
diff --git a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java
index 03ac8e1..3a1ba81 100644
--- a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java
+++ b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java
@@ -162,11 +162,21 @@ public class ModConfig
     @Config.RequiresMcRestart
     public boolean without_factory_dropper = false;
 
+    @Config.Comment({"Disable horizontal half-block slab."})
+    @Config.Name("Without slabs")
+    @Config.RequiresMcRestart
+    public boolean without_slabs = false;
+
     @Config.Comment({"Disable stackable 1/8 block slices."})
     @Config.Name("Without slab slices")
     @Config.RequiresMcRestart
     public boolean without_halfslabs = false;
 
+    @Config.Comment({"Disable directly picking up layers from slabs and slab " +
+                     "slices by left clicking while looking up/down."})
+    @Config.Name("Without slab pickup")
+    public boolean without_direct_slab_pickup = false;
+
     @Config.Comment({"Disable poles of any material."})
     @Config.Name("Without poles")
     @Config.RequiresMcRestart
@@ -385,6 +395,7 @@ public class ModConfig
     if(block instanceof BlockDecorPipeValve) return optout.without_valves;
     if(block instanceof BlockDecorHorizontalSupport) return optout.without_hsupports;
     // Type based evaluation where later filters may match, too
+    if(optout.without_slabs && (block instanceof BlockDecorSlab)) return true;
     if(optout.without_stairs && (block instanceof BlockDecorStairs)) return true;
     if(optout.without_walls && (block instanceof BlockDecorWall)) return true;
     if(optout.without_poles && (block instanceof BlockDecorStraightPole)) return true;
diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_slab.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_slab.json
new file mode 100644
index 0000000..2f654f8
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_slab.json
@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:slab/slab_s0_model",
+    "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture0" }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "parts": {
+      "0" : { "model": "engineersdecor:slab/slab_s0_model" },
+      "1" : { "model": "engineersdecor:slab/slab_s1_model" },
+      "2" : { "model": "engineersdecor:slab/slab_s2_model" }
+    },
+    "tvariant": {
+      "0":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture0"}},
+      "1":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture1"}},
+      "2":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture2"}},
+      "3":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture3"}},
+      "4":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture4"}},
+      "5":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture5"}},
+      "6":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture6"}},
+      "7":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture7"}}
+    }
+  }
+}
diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_slab.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_slab.json
new file mode 100644
index 0000000..16111a6
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_slab.json
@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:slab/slab_s0_model",
+    "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0" }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "parts": {
+      "0" : { "model": "engineersdecor:slab/slab_s0_model" },
+      "1" : { "model": "engineersdecor:slab/slab_s1_model" },
+      "2" : { "model": "engineersdecor:slab/slab_s2_model" }
+    },
+    "tvariant": {
+      "0":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0"}},
+      "1":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture1"}},
+      "2":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture2"}},
+      "3":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture3"}},
+      "4":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture4"}},
+      "5":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture5"}},
+      "6":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture6"}},
+      "7":{"textures":{"all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture7"}}
+    }
+  }
+}
diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/panzerglass_slab.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/panzerglass_slab.json
new file mode 100644
index 0000000..f215960
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/panzerglass_slab.json
@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:slab/slab_s0_model",
+    "textures": { "all": "engineersdecor:blocks/glass/panzerglass_block_texture0" }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "parts": {
+      "0" : { "model": "engineersdecor:slab/slab_s0_model" },
+      "1" : { "model": "engineersdecor:slab/slab_s1_model" },
+      "2" : { "model": "engineersdecor:slab/slab_s2_model" }
+    },
+    "tvariant": {
+      "0":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture0"}},
+      "1":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture1"}},
+      "2":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture2"}},
+      "3":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture3"}},
+      "4":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture0"}},
+      "5":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture1"}},
+      "6":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture2"}},
+      "7":{"textures":{"all": "engineersdecor:blocks/glass/panzerglass_block_texture3"}}
+    }
+  }
+}
diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_slab.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_slab.json
new file mode 100644
index 0000000..5d03258
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_slab.json
@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:slab/slab_s0_model",
+    "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture0" }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "parts": {
+      "0" : { "model": "engineersdecor:slab/slab_s0_model" },
+      "1" : { "model": "engineersdecor:slab/slab_s1_model" },
+      "2" : { "model": "engineersdecor:slab/slab_s2_model" }
+    },
+    "tvariant": {
+      "0":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture0"}},
+      "1":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture1"}},
+      "2":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture2"}},
+      "3":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture3"}},
+      "4":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture4"}},
+      "5":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture5"}},
+      "6":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture6"}},
+      "7":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_texture7"}}
+    }
+  }
+}
diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_tile_slab.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_tile_slab.json
new file mode 100644
index 0000000..f0ba1ff
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_tile_slab.json
@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:slab/slab_s0_model",
+    "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture0" }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "parts": {
+      "0" : { "model": "engineersdecor:slab/slab_s0_model" },
+      "1" : { "model": "engineersdecor:slab/slab_s1_model" },
+      "2" : { "model": "engineersdecor:slab/slab_s2_model" }
+    },
+    "tvariant": {
+      "0":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture0"}},
+      "1":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture1"}},
+      "2":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture2"}},
+      "3":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture3"}},
+      "4":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture4"}},
+      "5":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture5"}},
+      "6":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture6"}},
+      "7":{"textures":{"all": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture7"}}
+    }
+  }
+}
diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/slag_brick_slab.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/slag_brick_slab.json
new file mode 100644
index 0000000..a579b5f
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/slag_brick_slab.json
@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:slab/slab_s0_model",
+    "textures": { "all": "engineersdecor:blocks/slag_brick/slag_brick_texture0" }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "parts": {
+      "0" : { "model": "engineersdecor:slab/slab_s0_model" },
+      "1" : { "model": "engineersdecor:slab/slab_s1_model" },
+      "2" : { "model": "engineersdecor:slab/slab_s2_model" }
+    },
+    "tvariant": {
+      "0":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture0"}},
+      "1":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture1"}},
+      "2":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture2"}},
+      "3":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture3"}},
+      "4":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture4"}},
+      "5":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture5"}},
+      "6":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture6"}},
+      "7":{"textures":{"all": "engineersdecor:blocks/slag_brick/slag_brick_texture7"}}
+    }
+  }
+}
diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
index 9585494..1c51c1c 100644
--- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
+++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
@@ -8,7 +8,7 @@ itemGroup.tabengineersdecor=Engineer's Decor
 engineersdecor.config.title=Engineer's Decor Config
 engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r More Info§6]§r
 engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Help§6]§r
-
+engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab.
 #-----------------------------------------------------------------------------------------------------------
 # Stone/"ceramic material" based blocks
 #-----------------------------------------------------------------------------------------------------------
@@ -25,6 +25,19 @@ tile.engineersdecor.panzerglass_block.help=§6Reinforced glass block.§r Expensi
 tile.engineersdecor.rebar_concrete_tile.name=Rebar Concrete Tile
 tile.engineersdecor.rebar_concrete_tile.help=§6Steel reinforced concrete tile.§r Expensive but Creeper-proof like obsidian.
 #-----------------------------------------------------------------------------------------------------------
+tile.engineersdecor.clinker_brick_slab.name=Clinker Brick Slab
+tile.engineersdecor.clinker_brick_slab.help=§6Slab made from a Clinker Block.§r\nLooks slightly darker and more color intensive than the vanilla brick.
+tile.engineersdecor.clinker_brick_stained_slab.name=Stained Clinker Brick Slab
+tile.engineersdecor.clinker_brick_stained_slab.help=§6Slab made from a Stained Clinker Block.
+tile.engineersdecor.slag_brick_slab.name=Slag Brick Slab
+tile.engineersdecor.slag_brick_slab.help=§6A gray-brown brick slab.
+tile.engineersdecor.rebar_concrete_slab.name=Rebar Concrete Slab
+tile.engineersdecor.rebar_concrete_slab.help=§6Steel reinforced concrete slab.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.rebar_concrete_tile_slab.name=Rebar Concrete Tile Slab
+tile.engineersdecor.rebar_concrete_tile_slab.help=§6Steel reinforced concrete tile slab.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.panzerglass_slab.name=Panzer Glass Slab
+tile.engineersdecor.panzerglass_slab.help=§6Reinforced glass slab.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible.
+#-----------------------------------------------------------------------------------------------------------
 tile.engineersdecor.rebar_concrete_wall.name=Rebar Concrete Wall
 tile.engineersdecor.rebar_concrete_wall.help=§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.
 tile.engineersdecor.concrete_wall.name=Concrete Wall
diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
index 2f951db..4a71c2c 100644
--- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
+++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
@@ -8,7 +8,7 @@ itemGroup.tabengineersdecor=Engineer's Decor
 engineersdecor.config.title=Engineer's Decor конфигурация
 engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r Больше информации§6]§r
 engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Помощь§6]§r
-
+#engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab.
 #-----------------------------------------------------------------------------------------------------------
 # Stone/"ceramic material" based blocks
 #-----------------------------------------------------------------------------------------------------------
@@ -25,6 +25,19 @@ tile.engineersdecor.panzerglass_block.help=§6Усиленный стеклоб
 tile.engineersdecor.rebar_concrete_tile.name=Железобетонная плита
 tile.engineersdecor.rebar_concrete_tile.help=§6Стальная железобетонная плитка.§r Дорогая, но взрывоустойчивая, как обсидиан.
 #-----------------------------------------------------------------------------------------------------------
+tile.engineersdecor.clinker_brick_slab.name=Clinker Brick Slab
+#tile.engineersdecor.clinker_brick_slab.help=§6Slab made from a Clinker Block.§r\nLooks slightly darker and more color intensive than the vanilla brick.
+tile.engineersdecor.clinker_brick_stained_slab.name=Stained Clinker Brick Slab
+#tile.engineersdecor.clinker_brick_stained_slab.help=§6Slab made from a Stained Clinker Block.
+tile.engineersdecor.slag_brick_slab.name=Slag Brick Slab
+#tile.engineersdecor.slag_brick_slab.help=§6A gray-brown brick slab.
+tile.engineersdecor.rebar_concrete_slab.name=Rebar Concrete Slab
+#tile.engineersdecor.rebar_concrete_slab.help=§6Steel reinforced concrete slab.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.rebar_concrete_tile_slab.name=Rebar Concrete Tile Slab
+#tile.engineersdecor.rebar_concrete_tile_slab.help=§6Steel reinforced concrete tile slab.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.panzerglass_slab.name=Panzer Glass Slab
+#tile.engineersdecor.panzerglass_slab.help=§6Reinforced glass slab.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible.
+#-----------------------------------------------------------------------------------------------------------
 tile.engineersdecor.rebar_concrete_wall.name=Железобетонная стена
 tile.engineersdecor.rebar_concrete_wall.help=§6Стальная железобетонная стена.§r Дорогая, но взрывоустойчивая, как обсидиан.
 tile.engineersdecor.concrete_wall.name=Бетонная стена
diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
index 77060d2..1b88f35 100644
--- a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
+++ b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
@@ -8,7 +8,7 @@ itemGroup.tabengineersdecor=工程师的装饰
 engineersdecor.config.title=工程师的装饰配置
 engineersdecor.tooltip.hint.extended=§6[按§9SHIFT§r获取更多信息§6]§r
 engineersdecor.tooltip.hint.help=§6[按§9CTRL-SHIFT§r获取帮助§6]§r
-
+#engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab.
 #-----------------------------------------------------------------------------------------------------------
 # Stone/"ceramic material" based blocks
 #-----------------------------------------------------------------------------------------------------------
@@ -25,6 +25,19 @@ tile.engineersdecor.panzerglass_block.name=Panzer Glass Block
 tile.engineersdecor.rebar_concrete_tile.name=Rebar Concrete Tile
 #tile.engineersdecor.rebar_concrete_tile.help=§6Steel reinforced concrete tile.§r Expensive but Creeper-proof like obsidian.
 #-----------------------------------------------------------------------------------------------------------
+tile.engineersdecor.clinker_brick_slab.name=Clinker Brick Slab
+#tile.engineersdecor.clinker_brick_slab.help=§6Slab made from a Clinker Block.§r\nLooks slightly darker and more color intensive than the vanilla brick.
+tile.engineersdecor.clinker_brick_stained_slab.name=Stained Clinker Brick Slab
+#tile.engineersdecor.clinker_brick_stained_slab.help=§6Slab made from a Stained Clinker Block.
+tile.engineersdecor.slag_brick_slab.name=Slag Brick Slab
+#tile.engineersdecor.slag_brick_slab.help=§6A gray-brown brick slab.
+tile.engineersdecor.rebar_concrete_slab.name=Rebar Concrete Slab
+#tile.engineersdecor.rebar_concrete_slab.help=§6Steel reinforced concrete slab.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.rebar_concrete_tile_slab.name=Rebar Concrete Tile Slab
+#tile.engineersdecor.rebar_concrete_tile_slab.help=§6Steel reinforced concrete tile slab.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.panzerglass_slab.name=Panzer Glass Slab
+#tile.engineersdecor.panzerglass_slab.help=§6Reinforced glass slab.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible.
+#-----------------------------------------------------------------------------------------------------------
 tile.engineersdecor.rebar_concrete_wall.name=钢筋混凝土墙
 tile.engineersdecor.rebar_concrete_wall.help=§6钢筋混凝土墙.§r 昂贵,但像黑曜石一样防苦力怕.
 tile.engineersdecor.concrete_wall.name=水泥墙
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json
index bc6e770..58a7664 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json
@@ -2,6 +2,7 @@
 	"parent": "block/cube",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 2, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s1_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s1_model.json
index 8b658ae..dec38ae 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s1_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s1_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 4, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s2_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s2_model.json
index 86a0657..0f37c36 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s2_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s2_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 6, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s3_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s3_model.json
index 2d9492c..35b9bc2 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s3_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s3_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 8, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s4_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s4_model.json
index e3288fe..55c81bb 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s4_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s4_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 10, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s5_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s5_model.json
index 3534de5..309c3ad 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s5_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s5_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 12, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s6_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s6_model.json
index 7aa1e3e..364c546 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s6_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s6_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 14, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s7_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s7_model.json
index a9d646b..97f570f 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s7_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s7_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 0, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s8_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s8_model.json
index 1be83a3..74ed584 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s8_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s8_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 2, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s9_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s9_model.json
index 308cb88..b5c7554 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s9_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s9_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 4, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sa_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sa_model.json
index 76367b4..a4fc4f0 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sa_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sa_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 6, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sb_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sb_model.json
index d4417c5..3bdc001 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sb_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sb_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 8, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sc_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sc_model.json
index 0cfb7f9..e1414f5 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sc_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sc_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 10, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sd_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sd_model.json
index 59178ef..526737a 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sd_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sd_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
 		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 12, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_se_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_se_model.json
index c0ff07f..02665ee 100644
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_se_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_se_model.json
@@ -2,6 +2,7 @@
 	"parent": "engineersdecor:block/slab/halfslab_s0_model",
 	"textures": {
     "particle": "#all",
+    "side": "#all",
     "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
 	},
 	"elements": [
@@ -9,10 +10,10 @@
 			"from": [0, 14, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"texture": "#all"},
-				"east": {"texture": "#all"},
-				"south": {"texture": "#all"},
-				"west": {"texture": "#all"},
+				"north": {"texture": "#side"},
+				"east": {"texture": "#side"},
+				"south": {"texture": "#side"},
+				"west": {"texture": "#side"},
 				"up": {"texture": "#all"},
 				"down": {"texture": "#all"}
 			}
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s0_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s0_model.json
new file mode 100644
index 0000000..ec7563a
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s0_model.json
@@ -0,0 +1,8 @@
+{
+	"parent": "engineersdecor:block/slab/halfslab_s3_model",
+	"textures": {
+    "particle": "#all",
+    "side": "#all",
+		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
+	}
+}
\ No newline at end of file
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s1_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s1_model.json
new file mode 100644
index 0000000..06d0027
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s1_model.json
@@ -0,0 +1,8 @@
+{
+	"parent": "engineersdecor:block/slab/halfslab_sb_model",
+	"textures": {
+    "particle": "#all",
+    "side": "#all",
+		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
+	}
+}
\ No newline at end of file
diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s2_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s2_model.json
new file mode 100644
index 0000000..8ebea76
--- /dev/null
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/slab_s2_model.json
@@ -0,0 +1,8 @@
+{
+	"parent": "engineersdecor:block/slab/halfslab_s7_model",
+	"textures": {
+    "particle": "#all",
+    "side": "#all",
+		"all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture"
+	}
+}
\ No newline at end of file

From feb6f8bb1e44f272dc35440d1851cd2b2a73dad2 Mon Sep 17 00:00:00 2001
From: stfwi 
Date: Sun, 23 Jun 2019 16:27:42 +0200
Subject: [PATCH 06/14] Prepared version porting, wip snapshot.

---
 1.13/Makefile                                 |  11 +-
 1.13/build.gradle                             |  19 ++
 1.13/gradle.properties                        |   4 +-
 1.13/meta/update.json                         |   8 +-
 1.14/.gitignore                               |  37 ++++
 1.14/Makefile                                 |  78 ++++++++
 1.14/build.gradle                             |  98 ++++++++++
 1.14/gradle.properties                        |  15 ++
 1.14/gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 54708 bytes
 1.14/gradle/wrapper/gradle-wrapper.properties |   5 +
 1.14/gradlew                                  | 172 ++++++++++++++++++
 1.14/gradlew.bat                              |  84 +++++++++
 1.14/meta/update.json                         |  13 ++
 1.14/readme.md                                |  39 ++++
 1.14/tasks.js                                 |  13 ++
 tasks.js                                      |  28 ++-
 16 files changed, 610 insertions(+), 14 deletions(-)
 create mode 100644 1.14/.gitignore
 create mode 100644 1.14/Makefile
 create mode 100644 1.14/build.gradle
 create mode 100644 1.14/gradle.properties
 create mode 100644 1.14/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 1.14/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 1.14/gradlew
 create mode 100644 1.14/gradlew.bat
 create mode 100644 1.14/meta/update.json
 create mode 100644 1.14/readme.md
 create mode 100644 1.14/tasks.js

diff --git a/1.13/Makefile b/1.13/Makefile
index ef6783d..5d98a98 100644
--- a/1.13/Makefile
+++ b/1.13/Makefile
@@ -24,7 +24,7 @@ wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst
 #
 # Targets
 #
-.PHONY: default mod init clean clean-all all run install sanatize dist-check dist start-server
+.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server
 
 default: mod
 
@@ -42,8 +42,17 @@ clean:
 clean-all:
 	@echo "[1.13] Cleaning using gradle ..."
 	@rm -f dist/*
+	@rm -rf run/logs/
+	@rm -rf run/crash-reports/
 	@$(GRADLE) clean cleanCache
 
+mrproper: clean-all
+	@rm -rf meta/*
+	@rm -rf run/
+	@rm -rf out/
+	@rm -f .project
+	@rm -f .classpath
+
 init:
 	@echo "[1.13] Initialising eclipse workspace using gradle ..."
 	@$(GRADLE) eclipse
diff --git a/1.13/build.gradle b/1.13/build.gradle
index 5d48315..9b689b8 100644
--- a/1.13/build.gradle
+++ b/1.13/build.gradle
@@ -12,6 +12,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 //-----------------------------------------------------------------------------
 version = "${version_engineersdecor}"
@@ -77,3 +78,21 @@ jar {
     ])
   }
 }
+
+def reobfFile = file("$buildDir/reobfJar/output.jar")
+def reobfArtifact = artifacts.add('default', reobfFile) {
+  type 'jar'
+  builtBy 'reobfJar'
+}
+publishing {
+  publications {
+    mavenJava(MavenPublication) {
+      artifact reobfArtifact
+    }
+  }
+  repositories {
+    maven {
+      url "file:///${project.projectDir}/mcmodsrepo"
+    }
+  }
+}
diff --git a/1.13/gradle.properties b/1.13/gradle.properties
index b6af3b5..49f2732 100644
--- a/1.13/gradle.properties
+++ b/1.13/gradle.properties
@@ -2,8 +2,8 @@
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.13.2
-version_forge_minecraft=1.13.2-25.0.44
-version_engineersdecor=1.0.0-a1
+version_forge_minecraft=1.13.2-25.0.214
+version_engineersdecor=1.0.7-b5
 #
 # jar signing data loaded from signing.properties in the project root.
 #
diff --git a/1.13/meta/update.json b/1.13/meta/update.json
index ea1dd08..7956ce2 100644
--- a/1.13/meta/update.json
+++ b/1.13/meta/update.json
@@ -1,6 +1,12 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.13.2": {
+    "1.0.7-b4": "[A] Added stained clinker brick block/stairs.",
+    "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).",
+    "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.",
+    "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.",
+    "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.",
+    "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.",
     "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.",
     "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.",
     "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.",
@@ -10,6 +16,6 @@
   },
   "promos": {
     "1.13.2-recommended": "",
-    "1.13.2-latest": "1.0.2-b3"
+    "1.13.2-latest": "1.0.7-b4"
   }
 }
\ No newline at end of file
diff --git a/1.14/.gitignore b/1.14/.gitignore
new file mode 100644
index 0000000..af7450c
--- /dev/null
+++ b/1.14/.gitignore
@@ -0,0 +1,37 @@
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+out
+*.ipr
+*.iws
+*.iml
+.idea
+build
+.gradle
+*.tmp
+*.log
+*.jks
+eclipse
+run
+tests
+/dist
+signing.*
+src/main/java/archive
+src/main/resources/assets/minecraft
+.vscode
+/classes
+/dev
+/tmp
+/archive
+/assets-src
+.gimp
+*.xcf
+desktop.ini
+.DS_Store
+Thumbs.db
+forge*changelog.txt
+/*.txt
+mcmodsrepo
\ No newline at end of file
diff --git a/1.14/Makefile b/1.14/Makefile
new file mode 100644
index 0000000..bc23ff6
--- /dev/null
+++ b/1.14/Makefile
@@ -0,0 +1,78 @@
+# @file Makefile
+# @author Stefan Wilhelm (wile)
+# @license MIT
+#
+# GNU Make makefile based build relay.
+# Note for reviewers/clones: This file is a auxiliary script for my setup.
+# It's not needed to build the mod.
+#
+MOD_JAR_PREFIX=engineersdecor-
+MOD_JAR=$(filter-out %-sources.jar,$(wildcard build/libs/${MOD_JAR_PREFIX}*.jar))
+
+ifeq ($(OS),Windows_NT)
+GRADLE=gradlew.bat --no-daemon
+GRADLE_STOP=gradlew.bat --stop
+DJS=djs
+else
+GRADLE=./gradlew --no-daemon
+GRADLE_STOP=./gradlew --stop
+DJS=djs
+endif
+
+wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst *,%,$2),$d))
+
+#
+# Targets
+#
+.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server
+
+default: mod
+
+all: clean clean-all mod | install
+
+mod:
+	@echo "[1.14] Building mod using gradle ..."
+	@$(GRADLE) build $(GRADLE_OPTS)
+
+clean:
+	@echo "[1.14] Cleaning ..."
+	@rm -rf mcmodsrepo
+	@rm -f build/libs/*
+	@$(GRADLE) clean
+
+clean-all:
+	@echo "[1.14] Cleaning using gradle ..."
+	@rm -f dist/*
+	@rm -rf run/logs/
+	@rm -rf run/crash-reports/
+	@$(GRADLE) clean
+
+mrproper: clean-all
+	@rm -rf meta/*
+	@rm -rf run/
+	@rm -rf out/
+	@rm -f .project
+	@rm -f .classpath
+
+init:
+	@echo "[1.14] Initialising eclipse workspace using gradle ..."
+	@$(GRADLE) eclipse
+
+sanatize:
+	@echo "[1.14] Running sanatising tasks ..."
+	@djs tasks.js trailing-whitespaces
+	@djs tasks.js tabs-to-spaces
+	@djs tasks.js sync-languages
+	@djs tasks.js version-check
+	@djs tasks.js update-json
+	@git status -s .
+
+dist-check:
+	@echo "[1.14] Running dist checks ..."
+	@djs tasks.js dist-check
+
+dist: sanatize dist-check clean-all mod
+	@echo "[1.14] Distribution files ..."
+	@mkdir -p dist
+	@cp build/libs/$(MOD_JAR_PREFIX)* dist/
+	@djs tasks.js dist
diff --git a/1.14/build.gradle b/1.14/build.gradle
new file mode 100644
index 0000000..7a2a47d
--- /dev/null
+++ b/1.14/build.gradle
@@ -0,0 +1,98 @@
+// @file build.gradle
+// Engineer's decor mod gradle build relay (mc1.13.2)
+buildscript {
+  repositories {
+    maven { url = 'https://files.minecraftforge.net/maven' }
+    jcenter()
+    mavenCentral()
+  }
+  dependencies {
+    classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+  }
+}
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+//-----------------------------------------------------------------------------
+version = "${version_engineersdecor}"
+group = "wile.engineersdecor"
+archivesBaseName = "engineersdecor-${version_minecraft}"
+
+// def signing = { ->
+//   def sp = new Properties()
+//   if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) }
+//   return sp
+// }()
+
+// def git_version = { ->
+//   def stdout = new ByteArrayOutputStream()
+//   exec {
+//     commandLine 'git', 'log', '-1', '--format=%h'
+//     standardOutput = stdout
+//   }
+//   return stdout.toString().trim()
+// }()
+
+minecraft {
+  mappings channel: 'snapshot', version: "${version_fml_mappings}"
+  // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg')
+  runs {
+    client {
+      workingDirectory project.file('run')
+      property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+      property 'forge.logging.console.level', 'debug'
+      mods {
+        engineersdecor {
+          source sourceSets.main
+        }
+      }
+    }
+    server {
+      workingDirectory project.file('run')
+      property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+      property 'forge.logging.console.level', 'debug'
+      mods {
+        engineersdecor {
+          source sourceSets.main
+        }
+      }
+    }
+  }
+}
+
+dependencies {
+  minecraft "net.minecraftforge:forge:${version_forge_minecraft}"
+}
+
+jar {
+  manifest {
+    attributes([
+      "Specification-Title": "engineersdecor",
+      "Specification-Vendor": "wilechaote",
+      "Specification-Version": "1", // We are version 1 of ourselves
+      "Implementation-Title": project.name,
+      "Implementation-Version": "${version_engineersdecor}",
+      "Implementation-Vendor" :"wilechaote",
+      "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+    ])
+  }
+}
+
+def reobfFile = file("$buildDir/reobfJar/output.jar")
+def reobfArtifact = artifacts.add('default', reobfFile) {
+  type 'jar'
+  builtBy 'reobfJar'
+}
+publishing {
+  publications {
+    mavenJava(MavenPublication) {
+      artifact reobfArtifact
+    }
+  }
+  repositories {
+    maven {
+      url "file:///${project.projectDir}/mcmodsrepo"
+    }
+  }
+}
diff --git a/1.14/gradle.properties b/1.14/gradle.properties
new file mode 100644
index 0000000..8705d5d
--- /dev/null
+++ b/1.14/gradle.properties
@@ -0,0 +1,15 @@
+# @file gradle.properties
+org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx8G
+version_minecraft=1.14.2
+version_forge_minecraft=1.14.2-26.0.55
+version_fml_mappings=20190621-1.14.2
+version_engineersdecor=1.0.8-b2
+#
+# jar signing data loaded from signing.properties in the project root.
+#
+#signing.keystore_file=
+#signing.keystore_alias=
+#signing.keystore_pass=
+#signing.keystore_keypass=
+#fingerprint_sha1.fp_sha1=
diff --git a/1.14/gradle/wrapper/gradle-wrapper.jar b/1.14/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42
GIT binary patch
literal 54708
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

_x$+l{{cH8$W#CT literal 0 HcmV?d00001 diff --git a/1.14/gradle/wrapper/gradle-wrapper.properties b/1.14/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..949819d --- /dev/null +++ b/1.14/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/1.14/gradlew b/1.14/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/1.14/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/1.14/gradlew.bat b/1.14/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/1.14/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/1.14/meta/update.json b/1.14/meta/update.json new file mode 100644 index 0000000..f5018d5 --- /dev/null +++ b/1.14/meta/update.json @@ -0,0 +1,13 @@ +{ + "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", + "1.14.2": { + "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.", + "1.0.7-b5": "[U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2.\n[A] Factory dropper functionality ported.\n[A] Small lab furnace functionality ported.\n[A] Small electrical lab furnace functionality ported.\n[A] Small waste incinerator functionality ported.\n[A] Fluid valves, Passive Fluid Accumulator ported.\n[I] Issue: Scoped recipe constants still not working.", + "1.0.7-b4": "[U] Updated to Forge BETA 1.14.2-26.0.32/20190608-1.14.2.\n[A] Sitting on the stool ported.\n[A] Ladder climbing speed boost ported.\n[A] Crafting table functionality ported.\n[I] Issue: Scoped recipe constants not working yet with the current Forge version (or somehow changed).", + "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks." + }, + "promos": { + "1.14.2-recommended": "", + "1.14.2-latest": "1.0.8-b1" + } +} \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md new file mode 100644 index 0000000..bdf954d --- /dev/null +++ b/1.14/readme.md @@ -0,0 +1,39 @@ + +## Engineer's Decor (MC1.14.2) + +Mod sources for Minecraft version 1.14.2. + +- Description, credits, and features: Please see the readme in the repository root. + +- Compiled mod distribution channel is curseforge: https://www.curseforge.com/minecraft/mc-mods/engineers-decor/files. + +---- +## Version history + + ~ v1.0.8-b2 [U] Updated to Forge BETA 1.14.2-26.0.55/20190621-1.14.2, + code adapted to new mappings. + + - v1.0.8-b1 [V] Feature set of 1.12 ported. + [A] CTRL-SHIFT tooltips ported. + [A] Ported stained clinker block/stairs. + [M] Updated textures. + [I] Issue: Scoped recipe constants still not working. + + - v1.0.7-b5 [U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2. + [A] Factory dropper functionality ported. + [A] Small lab furnace functionality ported. + [A] Small electrical lab furnace functionality ported. + [A] Small waste incinerator functionality ported. + [A] Fluid valves, Passive Fluid Accumulator ported. + [I] Issue: Scoped recipe constants still not working. + + - v1.0.7-b4 [U] Updated to Forge BETA 1.14.2-26.0.32/20190608-1.14.2. + [A] Sitting on the stool ported. + [A] Ladder climbing speed boost ported. + [A] Crafting table functionality ported. + [I] Issue: Scoped recipe constants not working yet with + the current Forge version (or somehow changed). + + - v1.0.7-b3 [A] Initial 1.14.2 port of decorative blocks. + +---- diff --git a/1.14/tasks.js b/1.14/tasks.js new file mode 100644 index 0000000..1238ee0 --- /dev/null +++ b/1.14/tasks.js @@ -0,0 +1,13 @@ +#!/usr/bin/djs +// Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod. +"use strict"; +const constants = include("../meta/lib/constants.js")(); +const libtask = include("../meta/lib/libtask.js")(constants); +const liblang = include("../meta/lib/liblang.1.13.js")(constants); // 1.14 lang same as 1.13 +var tasks = {}; + +tasks["sync-languages"] = function() { + liblang.sync_languages(); +}; + +libtask.run(tasks, sys.args); diff --git a/tasks.js b/tasks.js index c4a053a..22b2896 100644 --- a/tasks.js +++ b/tasks.js @@ -53,19 +53,27 @@ tasks["sync-main-repository"] = function() { cd_main(); sys.shell("rm -rf documentation meta"); sys.shell("rm -f .gitignore credits.md license Makefile readme.md tasks.js"); - cd_main("1.12"); sys.shell("rm -rf meta src gradle"); - //cd_main("1.13"); sys.shell("rm -rf meta src gradle"); + cd_main("1.12"); sys.shell("rm -rf meta gradle src"); + cd_main("1.13"); sys.shell("rm -rf meta gradle"); + cd_main("1.14"); sys.shell("rm -rf meta gradle src"); cd_dev(); sys.shell("cp -f .gitignore credits.md license Makefile readme.md tasks.js \"" + main_repo_local + "/\"") sys.shell("cp -r documentation meta \"" + main_repo_local + "/\"") - cd_dev("1.12"); - sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.12/\"") - sys.shell("cp -r src gradle meta \"" + main_repo_local + "/1.12/\"") - //@todo uncomment after alpha code cleanup. - cd_dev("1.13"); - sys.shell("cp -f .gitignore readme.md tasks.js \"" + main_repo_local + "/1.13/\"") - //sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.13/\"") - //sys.shell("cp -r src gradle meta \"" + main_repo_local + "/1.13/\"") + { + cd_dev("1.12"); + sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.12/\"") + sys.shell("cp -r gradle meta src \"" + main_repo_local + "/1.12/\"") + } + { + cd_dev("1.13"); + sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.13/\"") + sys.shell("cp -r gradle meta \"" + main_repo_local + "/1.13/\"") + } + { + cd_dev("1.14"); + sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.14/\"") + sys.shell("cp -r gradle meta \"" + main_repo_local + "/1.14/\"") + } cd_main(); print("Main repository changes:"); print(sys.shell("git status -s")) From c611de59e2d047aaa9c76a819dceff19ee3138a3 Mon Sep 17 00:00:00 2001 From: stfwi Date: Wed, 26 Jun 2019 15:00:07 +0200 Subject: [PATCH 07/14] Updater meta data updated. --- 1.12/meta/update.json | 3 ++- meta/update.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 3658e35..eaa4bdd 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", "1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", "1.0.8-b2": "[F] Config opt-out fixed (thx IronPiston for the report #30).\n[A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching).", @@ -45,6 +46,6 @@ }, "promos": { "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.9-b1" + "1.12.2-latest": "1.0.9-b2" } } \ No newline at end of file diff --git a/meta/update.json b/meta/update.json index b62e701..ff1cfdb 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", "1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", "1.0.8-b2": "[F] Config opt-out fixed (thx IronPiston for the report #30).\n[A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching).", @@ -65,7 +66,7 @@ }, "promos": { "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.9-b1", + "1.12.2-latest": "1.0.9-b2", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b4", "1.14.2-recommended": "", From 0748d9fec46676b4a77b0d2046a7a227da1b971a Mon Sep 17 00:00:00 2001 From: stfwi Date: Sat, 29 Jun 2019 23:39:42 +0200 Subject: [PATCH 08/14] Models adapted (3rd/1st person display). Experimental Slab Slices: recipes. Experimental mineal melter concept implementation. --- 1.12/gradle.properties | 2 +- 1.12/readme.md | 8 +- .../blocks/BlockDecorDirectedHorizontal.java | 83 +++ .../blocks/BlockDecorMineralSmelter.java | 698 ++++++++++++++++++ .../wile/engineersdecor/blocks/ModBlocks.java | 59 +- .../blockstates/small_mineral_smelter.json | 17 + .../assets/engineersdecor/lang/en_us.lang | 5 + .../assets/engineersdecor/lang/ru_ru.lang | 5 + .../assets/engineersdecor/lang/zh_cn.lang | 5 + .../treated_wood_crafting_table_model.json | 5 + .../block/device/factory_dropper_model.json | 6 + .../furnace/small_mineral_smelter_model.json | 106 +++ .../framed_window_glasspane_submodel.json | 24 +- .../steel_framed_window_submodel.json | 9 + .../furniture/treated_wood_stool_model.json | 8 + .../treated_wood_window_submodel.json | 64 +- .../treated_wood_windowsill_model.json | 16 +- .../steel_double_t_support_model.json | 32 +- .../block/ladder/metal_rung_ladder_model.json | 30 +- .../block/ladder/metal_rung_steps_model.json | 5 + .../ladder/treated_wood_ladder_model.json | 6 +- .../models/block/light/inset_light_model.json | 32 +- .../pipe/passive_fluid_accumulator_model.json | 8 +- .../block/pipe/straight_pipe_valve_model.json | 7 +- .../block/pole/straight_pole_head_model.json | 5 + .../block/pole/straight_pole_model.json | 5 + .../pole/straight_pole_support_model.json | 4 + .../straight_thick_metal_pole_head_model.json | 4 + .../pole/straight_thick_metal_pole_model.json | 9 + .../straight_thin_metal_pole_head_model.json | 5 + .../pole/straight_thin_metal_pole_model.json | 5 + .../models/block/sign/sign_decor_model.json | 23 +- .../block/sign/sign_rect14x14_model.json | 24 +- .../block/sign/sign_triangular_model.json | 184 ++--- .../models/block/slab/halfslab_s0_model.json | 38 +- .../models/block/slab/halfslab_s3_model.json | 35 +- .../stairs/decor_inner_stairs_model.json | 36 +- .../stairs/decor_outer_stairs_model.json | 24 +- .../stairs/decor_straight_stairs_model.json | 39 +- .../wall/clinker_brick_wall_inventory.json | 10 + .../block/wall/concrete_wall_inventory.json | 10 + .../engineersdecor/recipes/_constants.json | 22 + .../device/small_mineral_smelter_recipe.json | 41 + .../slab/clinker_brick_slab_recipe.json | 21 + .../clinker_brick_stained_slab_recipe.json | 21 + .../slab/halfslab_rebar_concrete_recipe.json | 8 +- .../recipes/slab/panzerglass_slab_recipe.json | 21 + .../slab/rebar_concrete_slab_recipe.json | 21 + .../slab/rebar_concrete_tile_slab_recipe.json | 21 + .../recipes/slab/slag_brick_slab_recipe.json | 21 + .../furnace/small_mineral_smelter_bottom.png | Bin 0 -> 543 bytes .../small_mineral_smelter_front_s0.png | Bin 0 -> 618 bytes .../small_mineral_smelter_front_s1.png | Bin 0 -> 728 bytes .../small_mineral_smelter_front_s1.png.mcmeta | 1 + .../small_mineral_smelter_front_s2.png | Bin 0 -> 940 bytes .../small_mineral_smelter_front_s2.png.mcmeta | 1 + .../small_mineral_smelter_front_s3.png | Bin 0 -> 957 bytes .../small_mineral_smelter_front_s3.png.mcmeta | 1 + .../furnace/small_mineral_smelter_side.png | Bin 0 -> 606 bytes .../furnace/small_mineral_smelter_top.png | Bin 0 -> 562 bytes 1.13/gradle.properties | 4 +- 1.13/meta/update.json | 3 +- 1.13/readme.md | 5 +- 1.14/gradle.properties | 4 +- 1.14/meta/update.json | 3 +- 1.14/readme.md | 5 +- Makefile | 2 +- meta/update.json | 6 +- readme.md | 52 +- 69 files changed, 1686 insertions(+), 298 deletions(-) create mode 100644 1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDirectedHorizontal.java create mode 100644 1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/small_mineral_smelter.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_mineral_smelter_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/clinker_brick_slab_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/clinker_brick_stained_slab_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/panzerglass_slab_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/rebar_concrete_slab_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/rebar_concrete_tile_slab_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/slag_brick_slab_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_bottom.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s0.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s1.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s1.png.mcmeta create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s2.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s2.png.mcmeta create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s3.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s3.png.mcmeta create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_side.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_top.png diff --git a/1.12/gradle.properties b/1.12/gradle.properties index d996b7a..4c73964 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.9-b2 +version_engineersdecor=1.0.9-b3 diff --git a/1.12/readme.md b/1.12/readme.md index 3aa7814..c09db2e 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,7 +10,13 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - ~ v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, + ~ v1.0.9-b3 [A] Added missing recipes for slabs. + [A] Added slab slices for IE sheet metals, treated wood, + and concretes (stackable "quater-slabs"). + [M] Updated 1st/3rd person item model rotations/translations. + [M] Hardness of valves and furni slightly increased. + + - v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config). [F] Fixed lab/electrical furnace initialisation issue (first item diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDirectedHorizontal.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDirectedHorizontal.java new file mode 100644 index 0000000..34dc0dd --- /dev/null +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDirectedHorizontal.java @@ -0,0 +1,83 @@ +/* + * @file BlockDecorDirectedHorizontal.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Smaller directed block with direction set narrowed + * to horizontal directions. + */ +package wile.engineersdecor.blocks; + +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.IBlockState; +import net.minecraft.block.SoundType; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + + +public class BlockDecorDirectedHorizontal extends BlockDecorDirected +{ + public static final PropertyDirection FACING = BlockHorizontal.FACING; + + public BlockDecorDirectedHorizontal(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB unrotatedAABB) + { super(registryName, config|CFG_HORIZIONTAL, material, hardness, resistance, sound, unrotatedAABB); } + + @Override + public IBlockState getStateFromMeta(int meta) + { return this.getDefaultState().withProperty(FACING, EnumFacing.byHorizontalIndex(meta & 0x3)); } + + @Override + public int getMetaFromState(IBlockState state) + { return state.getValue(FACING).getHorizontalIndex(); } + + @Override + protected BlockStateContainer createBlockState() + { return new BlockStateContainer(this, FACING); } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { return AABBs.get(state.getValue(FACING).getIndex() & 0x7); } + + @Override + @Nullable + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) + { return getBoundingBox(state, world, pos); } + + @Override + public IBlockState withRotation(IBlockState state, Rotation rot) + { return state; } + + @Override + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) + { return state; } + + @Override + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) + { + if((config & CFG_LOOK_PLACEMENT) != 0) { + // horizontal placement in direction the player is looking + facing = placer.getHorizontalFacing(); + } else { + // horizontal placement on a face + facing = ((facing==EnumFacing.UP)||(facing==EnumFacing.DOWN)) ? (placer.getHorizontalFacing()) : facing; + } + if((config & CFG_OPPOSITE_PLACEMENT)!=0) facing = facing.getOpposite(); + if(((config & CFG_FLIP_PLACEMENT_SHIFTCLICK) != 0) && (placer.isSneaking())) facing = facing.getOpposite(); + return getDefaultState().withProperty(FACING, facing); + } + +} diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java new file mode 100644 index 0000000..bd6689a --- /dev/null +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java @@ -0,0 +1,698 @@ +/* + * @file BlockDecorMineralSmelter.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Small highly insulated stone liquification furnace + * (magmatic phase). + */ +package wile.engineersdecor.blocks; + +import net.minecraft.block.state.BlockFaceShape; +import net.minecraft.world.IBlockAccess; +import wile.engineersdecor.ModEngineersDecor; +import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.world.World; +import net.minecraft.world.Explosion; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.*; +import net.minecraft.inventory.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.*; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.HashSet; +import java.util.Random; +import java.util.Set; + +public class BlockDecorMineralSmelter extends BlockDecorDirectedHorizontal +{ + public static final int PHASE_MAX = 3; + public static final PropertyInteger PHASE = PropertyInteger.create("phase", 0, PHASE_MAX); + + public BlockDecorMineralSmelter(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB unrotatedAABB) + { + super(registryName, config, material, hardness, resistance, sound, unrotatedAABB); + setLightOpacity(0); + } + + @Override + protected BlockStateContainer createBlockState() + { return new BlockStateContainer(this, FACING, PHASE); } + + @Override + public IBlockState getStateFromMeta(int meta) + { return super.getStateFromMeta(meta).withProperty(PHASE, (meta>>2) & 0x3); } + + @Override + public int getMetaFromState(IBlockState state) + { return super.getMetaFromState(state) | (state.getValue(PHASE)<<2); } + + @Override + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) + { return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand).withProperty(PHASE, 0); } + + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face) + { return BlockFaceShape.SOLID; } + + @Override + @SuppressWarnings("deprecation") + public boolean hasComparatorInputOverride(IBlockState state) + { return true; } + + @Override + @SuppressWarnings("deprecation") + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) + { return MathHelper.clamp((state.getValue(PHASE)*5), 0, 15); } + + @Override + public boolean hasTileEntity(IBlockState state) + { return true; } + + @Nullable + public TileEntity createTileEntity(World world, IBlockState state) + { return new BlockDecorMineralSmelter.BTileEntity(); } + + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) + {} + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + { + if(world.isRemote) return true; + BTileEntity te = getTe(world, pos); + if(te==null) return super.removedByPlayer(state, world, pos, player, willHarvest); + ItemStack st = ItemStack.EMPTY; + if(!te.getStackInSlot(1).isEmpty()) { + st = te.getStackInSlot(1).copy(); + } else if(!te.getStackInSlot(0).isEmpty()) { + st = te.getStackInSlot(0).copy(); + } + te.reset_process(); + ItemStack stack = new ItemStack(this, 1); + world.spawnEntity(new EntityItem(world, pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, stack)); + world.setBlockToAir(pos); + world.removeTileEntity(pos); + if(!st.isEmpty()) { + st.setCount(1); + world.spawnEntity(new EntityItem(world, pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, st)); + } + return false; + } + + @Override + public void onBlockExploded(World world, BlockPos pos, Explosion explosion) + { + if(world.isRemote) return; + BTileEntity te = getTe(world, pos); + if(te==null) return; + te.reset_process(); + super.onBlockExploded(world, pos, explosion); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) + { + if(world.isRemote) return true; + if(player.isSneaking()) return false; + BTileEntity te = getTe(world, pos); + if(te==null) return true; + final ItemStack stack = player.getHeldItem(hand); + boolean dirty = false; + if(te.accepts_lava_container(stack)) { + if(stack.isItemEqualIgnoreDurability(BTileEntity.BUCKET_STACK)) { // check how this works with item capabilities or so + if(te.fluid_level() >= BTileEntity.MAX_BUCKET_EXTRACT_FLUID_LEVEL) { + te.reset_process(); + player.setHeldItem(hand, BTileEntity.LAVA_BUCKET_STACK.copy()); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 1f, 1f); + dirty = true; + } + } + } else if(stack.getItem() == Items.AIR) { + final ItemStack istack = te.getStackInSlot(1).copy(); + if(te.phase() > BTileEntity.PHASE_WARMUP) player.setFire(1); + if(!istack.isEmpty()) { + istack.setCount(1); + player.setHeldItem(hand, istack); + te.reset_process(); + dirty = true; + } + } else if(te.insert(stack.copy(),false)) { + stack.shrink(1); + dirty = true; + } + if(dirty) player.inventory.markDirty(); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rnd) + { + if(state.getBlock()!=this) return; + EnumParticleTypes particle = EnumParticleTypes.SMOKE_NORMAL; + switch(state.getValue(PHASE)) { + case BTileEntity.PHASE_WARMUP: + return; + case BTileEntity.PHASE_HOT: + if(rnd.nextInt(10) > 4) return; + break; + case BTileEntity.PHASE_MAGMABLOCK: + if(rnd.nextInt(10) > 7) return; + particle = EnumParticleTypes.SMOKE_LARGE; + break; + case BTileEntity.PHASE_LAVA: + if(rnd.nextInt(10) > 2) return; + particle = EnumParticleTypes.LAVA; + break; + default: + return; + } + final double x=0.5+pos.getX(), y=0.5+pos.getY(), z=0.5+pos.getZ(); + final double xr=rnd.nextDouble()*0.4-0.2, yr=rnd.nextDouble()*0.5, zr=rnd.nextDouble()*0.4-0.2; + world.spawnParticle(particle, x+xr, y+yr, z+zr, 0.0, 0.0, 0.0); + } + + @Nullable + private BTileEntity getTe(World world, BlockPos pos) + { final TileEntity te=world.getTileEntity(pos); return (!(te instanceof BTileEntity)) ? (null) : ((BTileEntity)te); } + + //-------------------------------------------------------------------------------------------------------------------- + // Tile entity + //-------------------------------------------------------------------------------------------------------------------- + + public static class BTileEntity extends TileEntity implements ITickable, ISidedInventory, IEnergyStorage + { + public static final int TICK_INTERVAL = 20; + public static final int MAX_FLUID_LEVEL = 1000; + public static final int MAX_BUCKET_EXTRACT_FLUID_LEVEL = 900; + public static final int MAX_ENERGY_BUFFER = 32000; + public static final int MAX_ENERGY_TRANSFER = 8192; + public static final int DEFAULT_ENERGY_CONSUMPTION = 92; + public static final int DEFAULT_HEATUP_RATE = 2; // -> 50s for one smelting process + public static final int PHASE_WARMUP = 0; + public static final int PHASE_HOT = 1; + public static final int PHASE_MAGMABLOCK = 2; + public static final int PHASE_LAVA = 3; + private static final ItemStack MAGMA_STACK = new ItemStack(Blocks.MAGMA); + private static final ItemStack BUCKET_STACK = new ItemStack(Items.BUCKET); + private static final ItemStack LAVA_BUCKET_STACK = new ItemStack(Items.LAVA_BUCKET); + private static int energy_consumption = DEFAULT_ENERGY_CONSUMPTION; + private static int heatup_rate = DEFAULT_HEATUP_RATE; + private static int cooldown_rate = 1; + private static Set accepted_minerals = new HashSet(); + private static Set accepted_lava_contrainers = new HashSet(); + + private int tick_timer_; + private int energy_stored_; + private int progress_; + private int fluid_level_; + private boolean force_block_update_; + private NonNullList stacks_ = NonNullList.withSize(2, ItemStack.EMPTY); + + static { + // Mineals: No Nether brick (made of Netherrack), + // no glazed terracotta, no obsidian, no stairs, slabs etc. + accepted_minerals.add(Item.getItemFromBlock(Blocks.COBBLESTONE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.STONE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.SANDSTONE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.PRISMARINE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.END_STONE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.MOSSY_COBBLESTONE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.RED_SANDSTONE)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.QUARTZ_BLOCK)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.BRICK_BLOCK)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.END_BRICKS)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.HARDENED_CLAY)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.STAINED_HARDENED_CLAY)); + accepted_minerals.add(Item.getItemFromBlock(Blocks.STONEBRICK)); + // Lava containers + accepted_lava_contrainers.add(Items.BUCKET); + } + + public static void on_config(int energy_consumption, int heatup_per_second) + { + energy_consumption = MathHelper.clamp(energy_consumption, 32, 4096); + heatup_rate = MathHelper.clamp(heatup_per_second, 1, 5); + cooldown_rate = MathHelper.clamp(heatup_per_second/2, 1, 5); + ModEngineersDecor.logger.info("Config mineal smelter energy consumption:" + energy_consumption + "rf/t, heat-up rate: " + heatup_rate + "%/s."); + } + + public BTileEntity() + { reset_process(); } + + public int progress() + { return progress_; } + + public int phase() + { + if(progress_ >= 100) return PHASE_LAVA; + if(progress_ >= 90) return PHASE_MAGMABLOCK; + if(progress_ >= 5) return PHASE_HOT; + return PHASE_WARMUP; + } + + public int fluid_level() + { return fluid_level_; } + + public int fluid_level_drain(int amount) + { amount = MathHelper.clamp(amount, 0, fluid_level_); fluid_level_ -= amount; return amount; } + + public int comparator_signal() + { return phase() * 5; } // -> 0..15 + + private boolean accepts_lava_container(ItemStack stack) + { return accepted_lava_contrainers.contains(stack.getItem()); } + + private boolean accepts_input(ItemStack stack) + { + if(!stacks_.get(0).isEmpty()) return false; + if(fluid_level() > MAX_BUCKET_EXTRACT_FLUID_LEVEL) { + return accepts_lava_container(stack); + } else { + return accepted_minerals.contains(stack.getItem()); + } + } + + public boolean insert(final ItemStack stack, boolean simulate) + { + if(stack.isEmpty() || (!accepts_input(stack))) return false; + if(!simulate) { + ItemStack st = stack.copy(); + st.setCount(st.getMaxStackSize()); + stacks_.set(0, st); + if(!accepts_lava_container(stack)) progress_ = 0; + force_block_update_ = true; + } + return true; + } + + public ItemStack extract(boolean simulate) + { + ItemStack stack = stacks_.get(1).copy(); + if(stack.isEmpty()) return ItemStack.EMPTY; + if(!simulate) reset_process(); + return stack; + } + + protected void reset_process() + { + stacks_ = NonNullList.withSize(2, ItemStack.EMPTY); + force_block_update_ = true; + fluid_level_ = 0; + tick_timer_ = 0; + progress_ = 0; + } + + public void readnbt(NBTTagCompound nbt) + { + energy_stored_ = nbt.getInteger("energy"); + progress_ = nbt.getInteger("progress"); + fluid_level_ = nbt.getInteger("fluidlevel"); + ItemStackHelper.loadAllItems(nbt, stacks_); + if(stacks_.size() != 1) reset_process(); + } + + protected void writenbt(NBTTagCompound nbt) + { + nbt.setInteger("energy", MathHelper.clamp(energy_stored_,0 , MAX_ENERGY_BUFFER)); + nbt.setInteger("progress", MathHelper.clamp(progress_,0 , 100)); + nbt.setInteger("fluidlevel", MathHelper.clamp(fluid_level_,0 , MAX_FLUID_LEVEL)); + ItemStackHelper.saveAllItems(nbt, stacks_); + } + + // TileEntity ------------------------------------------------------------------------------ + + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState os, IBlockState ns) + { return (os.getBlock() != ns.getBlock()) || (!(ns.getBlock() instanceof BlockDecorMineralSmelter)); } + + @Override + public void readFromNBT(NBTTagCompound compound) + { super.readFromNBT(compound); readnbt(compound); } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound compound) + { super.writeToNBT(compound); writenbt(compound); return compound; } + + // IWorldNamable --------------------------------------------------------------------------- + + @Override + public String getName() + { final Block block=getBlockType(); return (block!=null) ? (block.getTranslationKey() + ".name") : (""); } + + @Override + public boolean hasCustomName() + { return false; } + + @Override + public ITextComponent getDisplayName() + { return new TextComponentTranslation(getName(), new Object[0]); } + + // IInventory ------------------------------------------------------------------------------ + + @Override + public int getSizeInventory() + { return stacks_.size(); } + + @Override + public boolean isEmpty() + { for(ItemStack stack: stacks_) { if(!stack.isEmpty()) return false; } return true; } + + @Override + public ItemStack getStackInSlot(int index) + { return ((index >= 0) && (index < getSizeInventory())) ? stacks_.get(index) : ItemStack.EMPTY; } + + @Override + public ItemStack decrStackSize(int index, int count) + { return ItemStackHelper.getAndSplit(stacks_, index, count); } + + @Override + public ItemStack removeStackFromSlot(int index) + { return ItemStackHelper.getAndRemove(stacks_, index); } + + @Override + public void setInventorySlotContents(int index, ItemStack stack) + { if(stack.getCount()>getInventoryStackLimit()){stack.setCount(getInventoryStackLimit());} stacks_.set(index, stack); markDirty(); } + + @Override + public int getInventoryStackLimit() + { return 1; } + + @Override + public void markDirty() + { super.markDirty(); } + + @Override + public boolean isUsableByPlayer(EntityPlayer player) + { return ((world.getTileEntity(pos) == this) && (player.getDistanceSq(pos.getX()+0.5d, pos.getY()+0.5d, pos.getZ()+0.5d) <= 64.0d)); } + + @Override + public void openInventory(EntityPlayer player) + {} + + @Override + public void closeInventory(EntityPlayer player) + { markDirty(); } + + @Override + public boolean isItemValidForSlot(int index, ItemStack stack) + { return ((index==0) && accepts_input(stack)) || (index==1); } + + @Override + public int getField(int id) + { return 0; } + + @Override + public void setField(int id, int value) + {} + + @Override + public int getFieldCount() + { return 0; } + + @Override + public void clear() + { reset_process(); } + + // ISidedInventory ---------------------------------------------------------------------------- + + private static final int[] SIDED_INV_SLOTS = new int[] {0,1}; + + @Override + public int[] getSlotsForFace(EnumFacing side) + { return SIDED_INV_SLOTS; } + + @Override + public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) + { return (index==0) && isItemValidForSlot(index, stack); } + + @Override + public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) + { return (index==1) && (!stacks_.get(1).isEmpty()); } + + // IEnergyStorage ---------------------------------------------------------------------------- + + @Override + public boolean canExtract() + { return false; } + + @Override + public boolean canReceive() + { return true; } + + @Override + public int getMaxEnergyStored() + { return MAX_ENERGY_BUFFER; } + + @Override + public int getEnergyStored() + { return energy_stored_; } + + @Override + public int extractEnergy(int maxExtract, boolean simulate) + { return 0; } + + @Override + public int receiveEnergy(int maxReceive, boolean simulate) + { + if(energy_stored_ >= MAX_ENERGY_BUFFER) return 0; + int n = Math.min(maxReceive, (MAX_ENERGY_BUFFER - energy_stored_)); + if(n > MAX_ENERGY_TRANSFER) n = MAX_ENERGY_TRANSFER; + if(!simulate) {energy_stored_ += n; markDirty(); } + return n; + } + + // IItemHandler -------------------------------------------------------------------------------- + + protected static class BItemHandler implements IItemHandler + { + private BTileEntity te; + + BItemHandler(BTileEntity te) + { this.te = te; } + + @Override + public int getSlots() + { return 2; } + + @Override + public int getSlotLimit(int index) + { return te.getInventoryStackLimit(); } + + @Override + public boolean isItemValid(int slot, @Nonnull ItemStack stack) + { return te.isItemValidForSlot(slot, stack); } + + @Override + @Nonnull + public ItemStack insertItem(int index, @Nonnull ItemStack stack, boolean simulate) + { + ItemStack rstack = stack.copy(); + if((index!=0) || (!te.insert(stack.copy(), simulate))) return rstack; + rstack.shrink(1); + return rstack; + } + + @Override + @Nonnull + public ItemStack extractItem(int index, int amount, boolean simulate) + { return (index!=1) ? ItemStack.EMPTY : te.extract(simulate); } + + @Override + @Nonnull + public ItemStack getStackInSlot(int index) + { return te.getStackInSlot(index); } + } + + private BItemHandler item_handler_ = new BItemHandler(this); + + // IFluidHandler -------------------------------------------------------------------------------- + + private static class BFluidHandler implements IFluidHandler, IFluidTankProperties + { + private final FluidStack lava; + private final BTileEntity te; + private final IFluidTankProperties[] props_ = {this}; + BFluidHandler(BTileEntity te) { this.te=te; lava = new FluidStack(FluidRegistry.LAVA, 1); } + @Override @Nullable public FluidStack getContents() { return new FluidStack(lava, te.fluid_level()); } + @Override public IFluidTankProperties[] getTankProperties() { return props_; } + @Override public int fill(FluidStack resource, boolean doFill) { return 0; } + @Override public int getCapacity() { return 1000; } + @Override public boolean canFill() { return false; } + @Override public boolean canDrain() { return true; } + @Override public boolean canFillFluidType(FluidStack fluidStack) { return false; } + @Override public boolean canDrainFluidType(FluidStack fluidStack) { return fluidStack.isFluidEqual(lava); } + + @Override @Nullable public FluidStack drain(FluidStack resource, boolean doDrain) + { + if((te.fluid_level() <= 0) || (!resource.isFluidEqual(lava))) return null; + FluidStack fs = getContents(); + if(doDrain) te.fluid_level_drain(fs.amount); + return fs; + } + + @Override @Nullable public FluidStack drain(int maxDrain, boolean doDrain) + { + if(te.fluid_level() <= 0) return null; + maxDrain = (doDrain) ? (te.fluid_level_drain(maxDrain)) : (Math.min(maxDrain, te.fluid_level())); + return new FluidStack(FluidRegistry.LAVA, maxDrain); + } + } + + private final BFluidHandler fluid_handler_ = new BFluidHandler(this); + + // Capability export ---------------------------------------------------------------------------- + + @Override + public boolean hasCapability(Capability cap, EnumFacing facing) + { return ((cap==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + || (cap==CapabilityEnergy.ENERGY) + || (cap==CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + || (super.hasCapability(cap, facing)) + ); + } + + @Override + @SuppressWarnings("unchecked") + @Nullable + public T getCapability(Capability capability, @Nullable EnumFacing facing) + { + if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + return (T)item_handler_; + } else if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + return (T)fluid_handler_; + } else if(capability == CapabilityEnergy.ENERGY) { + return (T)this; + } else { + return super.getCapability(capability, facing); + } + } + + // ITickable ------------------------------------------------------------------------------------ + + @Override + public void update() + { + if(world.isRemote) return; + if(--tick_timer_ > 0) return; + tick_timer_ = TICK_INTERVAL; + boolean dirty = false; + final int last_phase = phase(); + final ItemStack istack = stacks_.get(0); + if(istack.isEmpty() && (fluid_level()==0)) { + progress_ = 0; + } else if((energy_stored_ <= 0) || (world.isBlockPowered(pos))) { + progress_ = MathHelper.clamp(progress_-cooldown_rate, 0,100); + } else if(progress_ >= 100) { + progress_ = 100; + energy_stored_ = MathHelper.clamp(energy_stored_-((energy_consumption*TICK_INTERVAL)/20), 0, MAX_ENERGY_BUFFER); + } else { + energy_stored_ = MathHelper.clamp(energy_stored_-(energy_consumption*TICK_INTERVAL), 0, MAX_ENERGY_BUFFER); + progress_ = MathHelper.clamp(progress_+heatup_rate, 0, 100); + } + int new_phase = phase(); + boolean is_lava_container = accepts_lava_container(istack); + if(is_lava_container || (new_phase != last_phase)) { + if(is_lava_container) { + // That stays in the slot until its extracted or somone takes it out. + if(istack.isItemEqual(BUCKET_STACK)) { + if(!stacks_.get(1).isItemEqual(LAVA_BUCKET_STACK)) { + if(fluid_level() >= MAX_BUCKET_EXTRACT_FLUID_LEVEL) { + stacks_.set(1, LAVA_BUCKET_STACK); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 0.2f, 1.3f); + } else { + stacks_.set(1, istack.copy()); + } + dirty = true; + } + } else { + stacks_.set(1, istack.copy()); + // Out stack -> Somehow the filled container or container with fluid+fluid_level(). + } + } else if(new_phase > last_phase) { + switch(new_phase) { + case PHASE_LAVA: + fluid_level_ = MAX_FLUID_LEVEL; + stacks_.set(1, ItemStack.EMPTY); + stacks_.set(0, ItemStack.EMPTY); + world.playSound(null, pos, SoundEvents.BLOCK_LAVA_AMBIENT, SoundCategory.BLOCKS, 0.2f, 1.0f); + dirty = true; + break; + case PHASE_MAGMABLOCK: + stacks_.set(1, MAGMA_STACK.copy()); + world.playSound(null, pos, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 0.2f, 0.8f); + dirty = true; + break; + case PHASE_HOT: + world.playSound(null, pos, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 0.2f, 0.8f); + break; + } + } else { + switch(new_phase) { + case PHASE_MAGMABLOCK: + stacks_.set(0, (fluid_level_ >= MAX_BUCKET_EXTRACT_FLUID_LEVEL) ? (MAGMA_STACK.copy()) : (ItemStack.EMPTY)); + stacks_.set(1, stacks_.get(0).copy()); + fluid_level_ = 0; + world.playSound(null, pos, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 0.5f, 1.1f); + dirty = true; + break; + case PHASE_HOT: + if(istack.isItemEqual(MAGMA_STACK)) { + stacks_.set(1, new ItemStack(Blocks.OBSIDIAN)); + } else { + stacks_.set(1, new ItemStack(Blocks.COBBLESTONE)); + } + world.playSound(null, pos, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 0.3f, 0.9f); + dirty = true; + break; + case PHASE_WARMUP: + world.playSound(null, pos, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 0.3f, 0.7f); + break; + } + } + } + IBlockState state = world.getBlockState(pos); + if((state.getBlock() instanceof BlockDecorMineralSmelter) && (force_block_update_ || (state.getValue(PHASE) != new_phase))) { + state = state.withProperty(PHASE, new_phase); + world.setBlockState(pos, state,3|16); + world.notifyNeighborsOfStateChange(pos, state.getBlock(),false); + force_block_update_ = false; + } + if(dirty) markDirty(); + } + } + +} diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index ba759be..e1da670 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -205,7 +205,7 @@ public class ModBlocks "straight_pipe_valve", BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| BlockDecor.CFG_CUTOUT, - Material.IRON, 0.5f, 15f, SoundType.METAL, + Material.IRON, 0.7f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) ); @@ -213,7 +213,7 @@ public class ModBlocks "straight_pipe_valve_redstone", BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| BlockDecor.CFG_CUTOUT|BlockDecor.CFG_REDSTONE_CONTROLLED, - Material.IRON, 0.5f, 15f, SoundType.METAL, + Material.IRON, 0.7f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) ); @@ -221,7 +221,7 @@ public class ModBlocks "straight_pipe_valve_redstone_analog", BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| BlockDecor.CFG_CUTOUT|BlockDecor.CFG_REDSTONE_CONTROLLED|BlockDecor.CFG_ANALOG, - Material.IRON, 0.5f, 15f, SoundType.METAL, + Material.IRON, 0.7f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) ); @@ -229,10 +229,31 @@ public class ModBlocks "passive_fluid_accumulator", BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| BlockDecor.CFG_CUTOUT, - Material.IRON, 0.5f, 15f, SoundType.METAL, + Material.IRON, 0.7f, 15f, SoundType.METAL, ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) ); + public static final BlockDecorWasteIncinerator SMALL_WASTE_INCINERATOR = new BlockDecorWasteIncinerator( + "small_waste_incinerator", + BlockDecor.CFG_DEFAULT|BlockDecor.CFG_ELECTRICAL, + Material.IRON, 1f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) + ); + + public static final BlockDecorDropper FACTORY_DROPPER = new BlockDecorDropper( + "factory_dropper", + BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_REDSTONE_CONTROLLED, + Material.IRON, 1f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,15) + ); + + public static final BlockDecorMineralSmelter SMALL_MINERAL_SMELTER = new BlockDecorMineralSmelter( + "small_mineral_smelter", + BlockDecor.CFG_LOOK_PLACEMENT, + Material.IRON, 1f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(1.1,0,1.1, 14.9,16,14.9) + ); + public static final BlockDecorDirected SIGN_HOTWIRE = new BlockDecorDirected( "sign_hotwire", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1<5 z#mpFE%x0I%g>Bo22vSOkS}P9^4**jsB5?PqG{zw3%ou}G3fs2f?kKmVs*}UH&pFTi z|5i%raB$i^*X!#mr4&pRcgNik5iUBO(U_cc+wsh>%huB3NqW*W)8*hP%^R zfZxy0=xvO%No#HXjT2<8^~RF#M|2&-?w?s zS?{g7JGIt%-uHdJi)3b$Qh0xVXIbn*HsRbJ3cYt) hYb?uxs?Or`-XGn|VjNejMuq?Y002ovPDHLkV1mOJ@N@tG literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s0.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s0.png new file mode 100644 index 0000000000000000000000000000000000000000..f75510d897e6da44a6c187dc729b8eec07eb6f7d GIT binary patch literal 618 zcmV-w0+s!VP)($FqsP--^{On-PfuPq4V5Ymm>EKOa?Xe< zDJ4V%5kW;j1l-9vqpFIfgyl?1i5MfmvI z+O}mJM{1Gc*vz=PzGl5%^XKi21PQ7|RDDBr`;W+TE$DiqN)HRRvIn&CuMPrmjh5C+c|42o#8_N{o@y zAb^+>T2Y29cT{x&nsZ)QxjTA#AyE9e)3)u>0TIDxbtk}uqu@X-s<;`UZE2c@aU9w0c5H8N z%O!W35ZHZul=huCwDm z&4xTLRMo#}K0tEKArC`%^1Onnf~+}^6cdl7R_{Tc*{wZL8_xJ>wYvNJqfhQWe)QON1XUa` zGlcflS`k%BDToLnf{K6$xKnFIRTV1*tCdm;IcKUn#f&9qN-5M@arf4AZN4lEqDlnX zp*y#?w~XV+;c)n8qUx!^_4PI5IP%xS12IOb8S?4w&JiJ~f(X+zadmZtnPF!5x~jWl zW=zw>n~MwjzGt3iqDVt*W?a5~%lY{^U%!0ea5xY`z|2^dh1hir!@zF0V}5?7lmgHo zm>DT0_!oJHuOsdi?EF+)U%?oJ4S)c1rC07xkz3SI>iQXeU1N7nIL z5kOR%3Z)c|jY0_IQV3lDZQCqX=~Frp>+X#kv(_M`L|tVprL4PGnzb)t%}-EOJtKviuVu;Mv-UZhEvm!%o2>l*8Tir}im7_m}_C1;L# zpsQ2@g!L8vHxF1P^;M1EdGM1wSiXIxmWm*_SK_-5FUy0yf<%D|o&HK5#0Vm|8`;Xs z^S~FwOF_GccHtNDz#T!T#Sqb#=Yax3fZCe8JP+Re&V&D(2Y&+}#mh8!j4+P?0000< KMNUMnLSTX?!B3n3 literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s1.png.mcmeta b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s1.png.mcmeta new file mode 100644 index 0000000..9b7ccbf --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s1.png.mcmeta @@ -0,0 +1 @@ +{ "animation":{ "frames": [0,1], "frametime":32, "interpolate":true }} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s2.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s2.png new file mode 100644 index 0000000000000000000000000000000000000000..bb90c61f7f88cd54dec1fe36b9e8cf18a77b44fa GIT binary patch literal 940 zcmV;d15^BoP)vzZ?-QT!?H1b>A1GeiV8qMH#xXEBfg;|C0k1(U?aq|@Ei zx9WbmsOlaO9O!J^q?UDWopavzocq+3!-o%(&T}%QNI(byp?zYEh*Eg(5fMZLB?2Ol z5-~=UQi|X`Ax6CSIOm8d;X|Nt4(~lNMp8;`&@On>G>B4Ypj}LfgM$OgvZSu-ml>5> z2Dp3oE@fHr=h+!rYhnn<2Zx6V5i+Gfgwbfk?(Qxj1VRX;uGEwgAp}OF5wC4+Q4|H% zTC_;3IE27pdz+1o4Ngx^sOy?6%LpORGz~h>84ic+?CfCYbG-Ket%MK)#u)gAdGG2e zGjBMb*8og=J)Cpx1`&J+t;CcPS(agnf-K9(^BiLg)4E=M{NdZJsWG+|rWg@uO;k$Z zoMRCPzS zj=1#(PiC9Ur}fhH<$e(ophYQC2$-TE&vUG`TwY!>Uw@s?9$V0xd^t8$vvE6p3m;-c zM9_5Rxu#(_98#7gw+90R$cHaa^hkHY`u#rDY{q0Vq1Wq?Vx;OaDiQkqKCw%vlxjVo)3ca) z5kUagGys@9Z(RqJ2uUfl)&%d--Z>ULP+hA8$huSbZyo?-Sw`x*am|BQ@ZcRiqw+Zu zTLEy9-CB(YmvzI`P7xv>y?0}E9(;P=Fdo-DQ@5zm6h>C#!FNwBDpS1wR>9Xlo&P5f z^upZ)SZm4i9OoR5ChKfu7mQENxOYeM#l?y|u+E|feZK!g;k)Wq=fSautjFo)H4mX1sYL@y*X+ z_4~nBza)OI)_HuIxOYcg?S7CA`aGF!GPCw-Jox(|5JsCBCzLw? O0000 zUDp&d00Z`<^-krqd}mZ{DO^t;jh83=+(Y7$dx4-Zyt!>fMTZuZ7|~{OJWL zrQrh+ve_Wf-KnaI*fdmCMF@cyBkoQ^f}G9C&4hHaz}?x|*+EqY6{@c#m>DT0 zx~>BtrNou#RiqZ|=n3m*tF56M8JqUkn->D8D(+6xG}PCxP(GTHUaqlaCTH6kJoqRS zpcYl!jMy}U5a_y&#bUw3AIDa?6Jlg}em+d!#)nc65o$*BQr|P3PMOVS+&DNufDq$$ zn0BvS zGj&dh4G(l|l>pUv3*Y7eKvh-v*o{jb{09%d`|=a2t1aE{CoGQ^Jo+{LD-Y_oc>oY& zBpmL8Il2?JKa3Rq8xLw#C8f0G0YJ)`?zdy4sqxc45o!Lx0{}N00=&rsGoy)-?#XlN z@{-=Jk-M_x!A6Ftg8LxB%y6LVIzkA;EF@SxT~X2!Jv_WP5B5I$fW^;3d706mW8C?@j%;vh>#Wu`QydKd0?+P5b)=x ztnJ{PJb34Rus&U4$0t~O0}XQV{Q#h9gsOXn)Ov9qXh>9_eu(EnKI^xxzc&va{SwHz fyW9`ng9m>BiQPfBWO6?Y00000NkvXXu0mjfo{hD1 literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s3.png.mcmeta b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s3.png.mcmeta new file mode 100644 index 0000000..4774ce8 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_front_s3.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "frames": [0,1,2], "frametime": 8, "interpolate": true } } \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_side.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_side.png new file mode 100644 index 0000000000000000000000000000000000000000..2f94b0558d250e793e2f0aeae5462d1a2460ce28 GIT binary patch literal 606 zcmV-k0-^nhP)z_eoL`B!PpAi*R>$*Hx7mBROY!?}QKlsI{W1 z1prf30uWPTv)L?FYps~s(m%jzwc_UHhSTYU0cwWC7)QaTjB`t> zikY$5Y!=~4DY!dkMo^`-h77|%?;SHkM2ImGLcrY@^pw&P0|+6YB7_hScc<1$DdoR0 z#TYpp4yfwbs~I7Lg`~AM68w8H3nwCo2oDbrJUu-DkWym3UN3huwYfXZeF@HpBEt3c zHT(UZ%jL3EoHdxeA+0sc4DX#bjZH+x2fZ)n*`2dCB0{MZn~_S+=yuDm(+QcZ-FqLa zs4|?-^ocHnK&^GO_dGgPWw+ZALSPt%@k8%4_i;ynue%*GeeM&5%vH>cpFe)^^71k& zKP}99wOTZJetzclc%+oFkeHb*0afMeeoxMsloIFjne*@8_@sD@k?nR%cc+v>Olh?8 sys9$0YqIi8qLZL%#&*3PTWbw~KLIsK8nYxp-v9sr07*qoM6N<$f*%PD=l}o! literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_top.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_mineral_smelter_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1f6e99f22a4224c623eeeb6674e58375609c356a GIT binary patch literal 562 zcmV-20?qx2P))U zj2I*9y3%`RjDd*Idnd+7jFD0b5g>$snep)OfSIAH9x(rl2&zgcg<31MR+eQUni(R( zzVF=K-C<^!86gA@G&9B+gb+Mo&KXrD_TIU_zh~d~+d+)fTIs#hT4Rji36^DHjKRL| zu25#sx~>59-d*~#EWUrgLugomwj)1Zu6Mlx{#pgcu|9 zJBh!%ys+;(IcESamy5HR6EZWTwdUZaG*#vC@saOeE`0s`n{C^?NC?5X)SD~sm1~ag=MvRdV0&j0`eER|C`3bWVfH8&_m|P;@ z@}@));pyqgtJGS(#nzf9`+rw_Tqz}&ILAB2Af@EV-n+a07*qoM6N<$f Date: Tue, 2 Jul 2019 20:45:03 +0200 Subject: [PATCH 09/14] Build/porting tools updated. Updater info updated. --- 1.14/Makefile | 7 +++- 1.14/meta/lib/halfslab_assets.js | 61 ++++++++++++++++++++++++++++++ 1.14/meta/lib/slab_assets.js | 64 ++++++++++++++++++++++++++++++++ 1.14/meta/update.json | 3 +- 1.14/readme.md | 3 +- 1.14/tasks.js | 32 ++++++++++++++++ meta/lib/constants.js | 3 +- meta/update.json | 3 +- 8 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 1.14/meta/lib/halfslab_assets.js create mode 100644 1.14/meta/lib/slab_assets.js diff --git a/1.14/Makefile b/1.14/Makefile index bc23ff6..f472b17 100644 --- a/1.14/Makefile +++ b/1.14/Makefile @@ -24,7 +24,7 @@ wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst # # Targets # -.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server +.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server assets default: mod @@ -76,3 +76,8 @@ dist: sanatize dist-check clean-all mod @mkdir -p dist @cp build/libs/$(MOD_JAR_PREFIX)* dist/ @djs tasks.js dist + +assets: + @echo "[1.14] Running asset generators ..." + @djs tasks.js create-slab-assets + @djs tasks.js create-half-slab-assets \ No newline at end of file diff --git a/1.14/meta/lib/halfslab_assets.js b/1.14/meta/lib/halfslab_assets.js new file mode 100644 index 0000000..be82d07 --- /dev/null +++ b/1.14/meta/lib/halfslab_assets.js @@ -0,0 +1,61 @@ +#!/usr/bin/djs +// run from tasks.js directory +"use strict"; +(function(constants, libassets){ + const me = {}; + const modid = constants.mod_registry_name(); + const assets_root = constants.local_assets_root(); + const hexchar = ['0','1','2','3','4','5','6','7','8','9','a','b','c','d','e']; // ('a'+parts) won't work so here we go + + const create_item_model = function(prefix, texture) { + const model = { + parent: modid+":block/slab/generic/halfslab_inventory_model", + textures: { all: texture } + } + const path = "models/item/halfslab_"+prefix+".json"; + if(!fs.writefile(path, JSON.stringify(model))) { + throw new Error("Failed to write item model file '"+ path +"'"); + } + }; + + const create_block_models = function(prefix, texture) { + for(var parts=0; parts<15; ++parts) { + const model = { + parent: modid+":block/slab/generic/halfslab_s"+hexchar[parts]+"_model", + textures: { all:texture } + } + const path = "models/block/slab/specific/halfslab_"+prefix+"_s"+hexchar[parts]+"_model.json"; + if(!fs.writefile(path, JSON.stringify(model))) { + throw new Error("Failed to write model file '"+ path +"'"); + } + } + }; + + const create_blockstate = function(prefix) { + var variants = {}; + for(var parts=0; parts<15; ++parts) { + variants[ ("parts="+parts).replace(/[\s]/g,"") ] = { + model: (modid+":block/slab/specific/halfslab_"+prefix+"_s"+hexchar[parts]+"_model").replace(/[\s]/g,"") + } + } + const path = "blockstates/halfslab_"+prefix+".json"; + if(!fs.writefile(path, JSON.stringify({variants:variants},null,1))) throw new Error("Failed to write blockstate '"+path+"'"); + return path; + }; + + me.create = function(data) { + const here = fs.cwd() + const registry_name_prefix = data.name_prefix; + const texture = data.texture; + if(!fs.chdir(assets_root)) throw new Error("Could not switch to assets root folder: '" + assets_root + "'"); + try { + create_block_models(registry_name_prefix, texture); + create_item_model(registry_name_prefix, texture); + create_blockstate(registry_name_prefix, texture); + } finally { + fs.chdir(here); + } + } + Object.freeze(me); + return me; +}); diff --git a/1.14/meta/lib/slab_assets.js b/1.14/meta/lib/slab_assets.js new file mode 100644 index 0000000..8ddf39c --- /dev/null +++ b/1.14/meta/lib/slab_assets.js @@ -0,0 +1,64 @@ +#!/usr/bin/djs +// run from tasks.js directory +"use strict"; +(function(constants, libassets){ + const me = {}; + const modid = constants.mod_registry_name(); + const assets_root = constants.local_assets_root(); + + const create_item_model = function(prefix, texture_prefix) { + const model = { + parent: modid+":block/slab/generic/slab_inventory_model", + textures: { all: modid+":block/"+texture_prefix+"0" } + } + const path = "models/item/"+prefix+"_slab.json"; + if(!fs.writefile(path, JSON.stringify(model))) { + throw new Error("Failed to write item model file '"+ path +"'"); + } + }; + + const create_block_models = function(prefix, texture_prefix) { + for(var parts=0; parts<3; ++parts) { + for(var tvariant=0; tvariant<4; ++tvariant) { + const model = { + parent: modid+":block/slab/generic/slab_s"+parts+"_model", + textures: { all: modid+":block/"+texture_prefix+tvariant } + } + const path = "models/block/slab/specific/"+prefix+"_slab_s"+parts+"v"+tvariant+"_model.json"; + if(!fs.writefile(path, JSON.stringify(model))) { + throw new Error("Failed to write model file '"+ path +"'"); + } + } + } + }; + + const create_blockstate = function(prefix) { + var variants = {}; + for(var parts=0; parts<3; ++parts) { + for(var tvariant=0; tvariant<4; ++tvariant) { + variants[ ("parts="+parts+",tvariant="+tvariant).replace(/[\s]/g,"") ] = { + model: (modid+":block/slab/specific/"+prefix+"_slab_s"+parts+"v"+tvariant+"_model").replace(/[\s]/g,"") + } + } + } + const path = "blockstates/"+prefix+"_slab.json"; + if(!fs.writefile(path, JSON.stringify({variants:variants},null,1))) throw new Error("Failed to write blockstate '"+path+"'"); + return path; + }; + + me.create = function(prefixes) { + const here = fs.cwd() + const registry_name_prefix = prefixes.name_prefix; + const texture_prefix = prefixes.texture_prefix; + if(!fs.chdir(assets_root)) throw new Error("Could not switch to assets root folder: '" + assets_root + "'"); + try { + create_block_models(registry_name_prefix, texture_prefix); + create_item_model(registry_name_prefix, texture_prefix); + create_blockstate(registry_name_prefix, texture_prefix); + } finally { + fs.chdir(here); + } + } + Object.freeze(me); + return me; +}); diff --git a/1.14/meta/update.json b/1.14/meta/update.json index 19d7904..2b33c94 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.14.2": { + "1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.", "1.0.8-b2": "[U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings.\n[M] Updated 1st/3rd person item model rotations/translations.", "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.", "1.0.7-b5": "[U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2.\n[A] Factory dropper functionality ported.\n[A] Small lab furnace functionality ported.\n[A] Small electrical lab furnace functionality ported.\n[A] Small waste incinerator functionality ported.\n[A] Fluid valves, Passive Fluid Accumulator ported.\n[I] Issue: Scoped recipe constants still not working.", @@ -9,6 +10,6 @@ }, "promos": { "1.14.2-recommended": "", - "1.14.2-latest": "1.0.8-b2" + "1.14.2-latest": "1.0.8-b3" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index 943c4e4..f66857c 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,7 +10,8 @@ Mod sources for Minecraft version 1.14.2. ---- ## Version history - ~ v1.0.8-b3 [U] + - v1.0.8-b3 [A] Ported slabs and slab slices from 1.12.2. + [A] IE independent ("standalone") recipes ported. - v1.0.8-b2 [U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings. diff --git a/1.14/tasks.js b/1.14/tasks.js index 1238ee0..f0920ad 100644 --- a/1.14/tasks.js +++ b/1.14/tasks.js @@ -10,4 +10,36 @@ tasks["sync-languages"] = function() { liblang.sync_languages(); }; +tasks["create-slab-assets"] = function() { + const libassets = include("../meta/lib/libassets.js")(constants); + const slab_assets = include("meta/lib/slab_assets.js")(constants, libassets); + const block_prefixes = [ + { name_prefix:"clinker_brick", texture_prefix:"clinker_brick/clinker_brick_texture" }, + { name_prefix:"clinker_brick_stained", texture_prefix:"clinker_brick/clinker_brick_stained_texture" }, + { name_prefix:"panzerglass", texture_prefix:"glass/panzerglass_block_texture" }, + { name_prefix:"rebar_concrete", texture_prefix:"concrete/rebar_concrete_texture" }, + { name_prefix:"rebar_concrete_tile", texture_prefix:"concrete/rebar_concrete_tile_texture" }, + { name_prefix:"slag_brick", texture_prefix:"slag_brick/slag_brick_texture" }, + ]; + for(var i in block_prefixes) slab_assets.create(block_prefixes[i]); +} + +tasks["create-half-slab-assets"] = function() { + const libassets = include("../meta/lib/libassets.js")(constants); + const halfslab_assets = include("meta/lib/halfslab_assets.js")(constants, libassets); + const modid = constants.mod_registry_name(); + const block_data = [ + { name_prefix:"rebar_concrete", texture:modid+":block/concrete/rebar_concrete_texture0" }, + { name_prefix:"concrete", texture:modid+":block/ieoriginal/ie_stone_decoration_concrete" }, + { name_prefix:"treated_wood", texture:"immersiveengineering:blocks/treated_wood" }, + { name_prefix:"sheetmetal_iron", texture:"immersiveengineering:blocks/sheetmetal_iron" }, + { name_prefix:"sheetmetal_steel", texture:"immersiveengineering:blocks/sheetmetal_steel" }, + { name_prefix:"sheetmetal_copper", texture:"immersiveengineering:blocks/sheetmetal_copper" }, + { name_prefix:"sheetmetal_gold", texture:"immersiveengineering:blocks/sheetmetal_gold" }, + { name_prefix:"sheetmetal_aluminum", texture:"immersiveengineering:blocks/sheetmetal_aluminum" }, + // { name_prefix:"clinker_brick", texture:modid+":block/clinker_brick/clinker_brick_texture0" } + ]; + for(var i in block_data) halfslab_assets.create(block_data[i]); +} + libtask.run(tasks, sys.args); diff --git a/meta/lib/constants.js b/meta/lib/constants.js index dc5d30a..8ac4431 100644 --- a/meta/lib/constants.js +++ b/meta/lib/constants.js @@ -2,6 +2,7 @@ (function(){ var c = {}; c.mod_registry_name = function() { return "engineersdecor" } + c.local_assets_root = function() { return "src/main/resources/assets/" + c.mod_registry_name(); } c.reference_repository = function() { return "git@github.com:stfwi/engineers-decor.git"; } c.gradle_property_modversion = function() { return "version_engineersdecor"; } c.gradle_property_version_minecraft = function() { return "version_minecraft"; } @@ -16,4 +17,4 @@ Object.freeze(c.languages); Object.freeze(c); return c; -}); \ No newline at end of file +}); diff --git a/meta/update.json b/meta/update.json index 238d1d1..63529ae 100644 --- a/meta/update.json +++ b/meta/update.json @@ -60,6 +60,7 @@ "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, "1.14.2": { + "1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.", "1.0.8-b2": "[U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings.\n[M] Updated 1st/3rd person item model rotations/translations.", "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.", "1.0.7-b5": "[U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2.\n[A] Factory dropper functionality ported.\n[A] Small lab furnace functionality ported.\n[A] Small electrical lab furnace functionality ported.\n[A] Small waste incinerator functionality ported.\n[A] Fluid valves, Passive Fluid Accumulator ported.\n[I] Issue: Scoped recipe constants still not working.", @@ -72,6 +73,6 @@ "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.2-recommended": "", - "1.14.2-latest": "1.0.8-b2" + "1.14.2-latest": "1.0.8-b3" } } \ No newline at end of file From 8b99f38f17e2bb1058eeaa0beb4fc4ed6245e024 Mon Sep 17 00:00:00 2001 From: stfwi Date: Thu, 4 Jul 2019 21:26:30 +0200 Subject: [PATCH 10/14] 1.12: Missing slab recipes added. Slab slices added. Item displays fixed. Block hardness fixes. 1.14: Updated to 1.14.3. Mineral Smelter concept implementation. --- 1.12/Makefile | 2 +- 1.12/meta/update.json | 3 ++- 1.12/readme.md | 2 +- .../blocks/BlockDecorMineralSmelter.java | 26 ++++++++++++++++--- 1.13/Makefile | 2 +- 1.14/Makefile | 3 ++- 1.14/gradle.properties | 6 ++--- 1.14/meta/update.json | 7 ++--- 1.14/readme.md | 7 +++-- meta/update.json | 10 ++++--- tasks.js | 8 +++--- 11 files changed, 51 insertions(+), 25 deletions(-) diff --git a/1.12/Makefile b/1.12/Makefile index f74e1e4..12a5f78 100644 --- a/1.12/Makefile +++ b/1.12/Makefile @@ -51,7 +51,7 @@ clean-all: clean @$(GRADLE) clean cleanCache mrproper: clean-all - @rm -rf meta/* + @rm -f meta/*.* @rm -rf run/ @rm -rf out/ @rm -f .project diff --git a/1.12/meta/update.json b/1.12/meta/update.json index eaa4bdd..5e901fa 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", "1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", @@ -46,6 +47,6 @@ }, "promos": { "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.9-b2" + "1.12.2-latest": "1.0.9-b3" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index c09db2e..e3823d3 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,7 +10,7 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - ~ v1.0.9-b3 [A] Added missing recipes for slabs. + - v1.0.9-b3 [A] Added missing recipes for slabs. [A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable "quater-slabs"). [M] Updated 1st/3rd person item model rotations/translations. diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java index bd6689a..6a733be 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java @@ -154,10 +154,28 @@ public class BlockDecorMineralSmelter extends BlockDecorDirectedHorizontal if(te.accepts_lava_container(stack)) { if(stack.isItemEqualIgnoreDurability(BTileEntity.BUCKET_STACK)) { // check how this works with item capabilities or so if(te.fluid_level() >= BTileEntity.MAX_BUCKET_EXTRACT_FLUID_LEVEL) { - te.reset_process(); - player.setHeldItem(hand, BTileEntity.LAVA_BUCKET_STACK.copy()); - world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 1f, 1f); - dirty = true; + if(stack.getCount() > 1) { + int target_stack_index = -1; + for(int i=0; i= 0) { + te.reset_process(); + stack.shrink(1); + player.setHeldItem(hand, stack); + player.inventory.setInventorySlotContents(target_stack_index, BTileEntity.LAVA_BUCKET_STACK.copy()); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 1f, 1f); + dirty = true; + } + } else { + te.reset_process(); + player.setHeldItem(hand, BTileEntity.LAVA_BUCKET_STACK.copy()); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 1f, 1f); + dirty = true; + } } } } else if(stack.getItem() == Items.AIR) { diff --git a/1.13/Makefile b/1.13/Makefile index 5d98a98..671af46 100644 --- a/1.13/Makefile +++ b/1.13/Makefile @@ -47,7 +47,7 @@ clean-all: @$(GRADLE) clean cleanCache mrproper: clean-all - @rm -rf meta/* + @rm -f meta/*.* @rm -rf run/ @rm -rf out/ @rm -f .project diff --git a/1.14/Makefile b/1.14/Makefile index f472b17..4874f82 100644 --- a/1.14/Makefile +++ b/1.14/Makefile @@ -42,13 +42,14 @@ clean: clean-all: @echo "[1.14] Cleaning using gradle ..." + @rm -rf mcmodsrepo @rm -f dist/* @rm -rf run/logs/ @rm -rf run/crash-reports/ @$(GRADLE) clean mrproper: clean-all - @rm -rf meta/* + @rm -f meta/*.* @rm -rf run/ @rm -rf out/ @rm -f .project diff --git a/1.14/gradle.properties b/1.14/gradle.properties index b9603e5..7885d11 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -1,10 +1,10 @@ # @file gradle.properties org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G -version_minecraft=1.14.2 -version_forge_minecraft=1.14.2-26.0.63 +version_minecraft=1.14.3 +version_forge_minecraft=1.14.3-27.0.17 version_fml_mappings=20190621-1.14.2 -version_engineersdecor=1.0.8-b3 +version_engineersdecor=1.0.9-b1 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/meta/update.json b/1.14/meta/update.json index 2b33c94..c0503a5 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", - "1.14.2": { + "1.14.3": { + "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.", "1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.", "1.0.8-b2": "[U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings.\n[M] Updated 1st/3rd person item model rotations/translations.", "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.", @@ -9,7 +10,7 @@ "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks." }, "promos": { - "1.14.2-recommended": "", - "1.14.2-latest": "1.0.8-b3" + "1.14.3-recommended": "", + "1.14.3-latest": "1.0.9-b1" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index f66857c..7865321 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -1,7 +1,7 @@ -## Engineer's Decor (MC1.14.2) +## Engineer's Decor (MC1.14.3) -Mod sources for Minecraft version 1.14.2. +Mod sources for Minecraft version 1.14.3. - Description, credits, and features: Please see the readme in the repository root. @@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.14.2. ---- ## Version history + - v1.0.9-b1 [U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2. + [A] Added Small Mineral Smelter. + - v1.0.8-b3 [A] Ported slabs and slab slices from 1.12.2. [A] IE independent ("standalone") recipes ported. diff --git a/meta/update.json b/meta/update.json index 63529ae..cb6f767 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", "1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", @@ -59,7 +60,8 @@ "1.0.0-a2": "[A] Added panzer glass.", "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, - "1.14.2": { + "1.14.3": { + "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.", "1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.", "1.0.8-b2": "[U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings.\n[M] Updated 1st/3rd person item model rotations/translations.", "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.", @@ -69,10 +71,10 @@ }, "promos": { "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.9-b2", + "1.12.2-latest": "1.0.9-b3", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", - "1.14.2-recommended": "", - "1.14.2-latest": "1.0.8-b3" + "1.14.3-recommended": "", + "1.14.3-latest": "1.0.9-b1" } } \ No newline at end of file diff --git a/tasks.js b/tasks.js index 22b2896..73783ea 100644 --- a/tasks.js +++ b/tasks.js @@ -13,20 +13,20 @@ tasks["update-json"] = function() { var update_jsons = { "1.12.2": JSON.parse(fs.readfile(root_dir + "/1.12/meta/update.json")), "1.13.2": JSON.parse(fs.readfile(root_dir + "/1.13/meta/update.json")), - "1.14.2": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json")) + "1.14.3": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json")) }; var update_json = { homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": update_jsons["1.12.2"]["1.12.2"], "1.13.2": update_jsons["1.13.2"]["1.13.2"], - "1.14.2": update_jsons["1.14.2"]["1.14.2"], + "1.14.3": update_jsons["1.14.3"]["1.14.3"], promos: { "1.12.2-recommended": update_jsons["1.12.2"]["promos"]["1.12.2-recommended"], "1.12.2-latest": update_jsons["1.12.2"]["promos"]["1.12.2-latest"], "1.13.2-recommended": update_jsons["1.13.2"]["promos"]["1.13.2-recommended"], "1.13.2-latest": update_jsons["1.13.2"]["promos"]["1.13.2-latest"], - "1.14.2-recommended": update_jsons["1.14.2"]["promos"]["1.14.2-recommended"], - "1.14.2-latest": update_jsons["1.14.2"]["promos"]["1.14.2-latest"] + "1.14.3-recommended": update_jsons["1.14.3"]["promos"]["1.14.3-recommended"], + "1.14.3-latest": update_jsons["1.14.3"]["promos"]["1.14.3-latest"] } } fs.mkdir(root_dir + "/meta"); From d880b90a483ef8503c71d0802dc4693e2f514c33 Mon Sep 17 00:00:00 2001 From: stfwi Date: Sat, 6 Jul 2019 15:28:16 +0200 Subject: [PATCH 11/14] 1.14.3: Fixed issue #35, issue #36, #37. 1.12: Treated Wood Side Table work in progress. 1.12: Release version prepared. --- 1.12/gradle.properties | 2 +- 1.12/readme.md | 500 +++++++++--------- .../engineersdecor/ModEngineersDecor.java | 3 +- .../engineersdecor/blocks/BlockDecor.java | 28 +- .../wile/engineersdecor/blocks/ModBlocks.java | 8 + .../engineersdecor/detail/ClientProxy.java | 8 +- .../blockstates/treated_wood_side_table.json | 10 + .../assets/engineersdecor/lang/en_us.lang | 2 + .../assets/engineersdecor/lang/ru_ru.lang | 2 + .../assets/engineersdecor/lang/zh_cn.lang | 2 + .../treated_wood_side_table_model.json | 206 ++++++++ .../metal_rung_ladder_recipe_standalone.json | 4 +- 1.13/readme.md | 3 +- 1.14/gradle.properties | 4 +- 1.14/meta/update.json | 3 +- 1.14/readme.md | 7 + meta/update.json | 3 +- 17 files changed, 535 insertions(+), 260 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_side_table.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 4c73964..f1f2d83 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.9-b3 +version_engineersdecor=1.0.10-b1 diff --git a/1.12/readme.md b/1.12/readme.md index e3823d3..7b2bca2 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,290 +10,306 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - - v1.0.9-b3 [A] Added missing recipes for slabs. - [A] Added slab slices for IE sheet metals, treated wood, - and concretes (stackable "quater-slabs"). - [M] Updated 1st/3rd person item model rotations/translations. - [M] Hardness of valves and furni slightly increased. + ~ v1.0.10-b1 [I] Features WIP + [A] Treated wood side table added. + [F] Fixed recipe collision of Metal Rung Ladder (issue #37, + thx ProsperCraft for reporting). - - v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, - and Stained Clinker. Texture variations like the base blocks. - Allow fast pick-up (see tooltip help or config). - [F] Fixed lab/electrical furnace initialisation issue (first item - inserted was smelted directly). + ------------------------------------------------------------------- + ~ v1.0.9 [T] In release test. + [R] Release based on v1.0.9-b3. Release-to-release changes: + * Slabs for clinker, concrete, slag bricks. + * Slab slices for sheet metals, treated wood, and concretes. + * Language updates. + * Block hardness adaptions. + * 1st/3rd person item model fixes. + * Furnace initialisation issue fixed. + ------------------------------------------------------------------- - - v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). - [M] Block hardness adaptions (issue #32). + - v1.0.9-b3 [A] Added missing recipes for slabs. + [A] Added slab slices for IE sheet metals, treated wood, + and concretes (stackable "quater-slabs"). + [M] Updated 1st/3rd person item model rotations/translations. + [M] Hardness of valves and furni slightly increased. - ------------------------------------------------------------------- - - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: - * Added factory area sign. - * Added stained clinker. - * Config opt-out fixes, detailed feature selection possible now. - * Recipe adaptions and fixes. - * Lang files updated. - ------------------------------------------------------------------- - [A] Added stained clinker brick block/stairs. Can be mixed with - "normal" clinkers. - [A] Added opt-out option for CTRL-SHIFT tooltips. - [M] Recipe condition requirements updated, recipes categorized. + - v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, + and Stained Clinker. Texture variations like the base blocks. + Allow fast pick-up (see tooltip help or config). + [F] Fixed lab/electrical furnace initialisation issue (first item + inserted was smelted directly). - - v1.0.8-b2 [F] Config opt-out fixed (thx IronPiston for the report #30). - [A] Added opt-out config for detailed including/excluding - of features (using registry name wildcard matching). + - v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). + [M] Block hardness adaptions (issue #32). - - v1.0.8-b1 [A] Added "Factory area" sign. - [M] Electrical furnace recipe changed (hoppers to conveyors). - [A] Opt-out config options added. - [F] Lang file fixes for en_us (Angela, PR#29). + ------------------------------------------------------------------- + - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: + * Added factory area sign. + * Added stained clinker. + * Config opt-out fixes, detailed feature selection possible now. + * Recipe adaptions and fixes. + * Lang files updated. + ------------------------------------------------------------------- + [A] Added stained clinker brick block/stairs. Can be mixed with + "normal" clinkers. + [A] Added opt-out option for CTRL-SHIFT tooltips. + [M] Recipe condition requirements updated, recipes categorized. - ------------------------------------------------------------------- - - v1.0.7 [R] Release based on v1.0.7-b2. Release-to-release changes: - * Factory dropper added. - * Defense system warning sign added. - * Warning sign backgrounds adapted. - * Standalone recipes added. - * Lang files updated. - ------------------------------------------------------------------- - [A] Added standalone recipes for signs, factory dropper, and - electrical furnace. - [M] Adapted "Caution" sign backgrounds to the yellow defense - system warning background. + - v1.0.8-b2 [F] Config opt-out fixed (thx IronPiston for the report #30). + [A] Added opt-out config for detailed including/excluding + of features (using registry name wildcard matching). - - v1.0.7-b2 [A] Added Defense System Warning sign (design by J. Carver). - [M] Factory dropper non-experimental now. GUI click area tuning. - "Fast drop" symbol replaced from arrow to dog icon (thx - overchoice for that icon). - [M] Lang files updated. + - v1.0.8-b1 [A] Added "Factory area" sign. + [M] Electrical furnace recipe changed (hoppers to conveyors). + [A] Opt-out config options added. + [F] Lang file fixes for en_us (Angela, PR#29). - - v1.0.7-b1 [M] Factory dropper (config:experimental) button placement fixed, - GUI vs external view x/y markers added, internal trigger logic - simplified. Thx @overchoice for beta testing! + ------------------------------------------------------------------- + - v1.0.7 [R] Release based on v1.0.7-b2. Release-to-release changes: + * Factory dropper added. + * Defense system warning sign added. + * Warning sign backgrounds adapted. + * Standalone recipes added. + * Lang files updated. + ------------------------------------------------------------------- + [A] Added standalone recipes for signs, factory dropper, and + electrical furnace. + [M] Adapted "Caution" sign backgrounds to the yellow defense + system warning background. - ------------------------------------------------------------------- - - v1.0.6 [R] Release based on v1.0.6-b1. Release-to-release changes: - * Fixed FML remapping issue (COULD CAUSE CRASHES). - * Small waste incinerator added. - * Lang files updated/corrections. - * Metal ladder easier to break. - ------------------------------------------------------------------- - [A] Added factory dropper (config:experimental). - [C] Thx to abdurraslan for the detailed issue #25. + - v1.0.7-b2 [A] Added Defense System Warning sign (design by J. Carver). + [M] Factory dropper non-experimental now. GUI click area tuning. + "Fast drop" symbol replaced from arrow to dog icon (thx + overchoice for that icon). + [M] Lang files updated. - - v1.0.6-b1 [A] Added small waste incinerator (delayed fifo-buffered item disposal). - [M] Fixed item/block name capitalization (by Voxelo). - [M] Metal ladders are easier to break/harvest. - [F] Fixed FML remapping issue by using dedicated IItemHandler instances. + - v1.0.7-b1 [M] Factory dropper (config:experimental) button placement fixed, + GUI vs external view x/y markers added, internal trigger logic + simplified. Thx @overchoice for beta testing! - ------------------------------------------------------------------- - - v1.0.5 [R] Release based on v1.0.5-b1. Release-to-release changes: - * Small electrical passthrough-furnace added. - * Passive fluid accumulator added. - * Config options added. - * Sign plates added. - * Minor bug fixes. - ------------------------------------------------------------------- - [A] Added sign "Electrical hazard"/"Caution hot wire". - [A] Added sign "Caution dangerous there" (skull/bones). + ------------------------------------------------------------------- + - v1.0.6 [R] Release based on v1.0.6-b1. Release-to-release changes: + * Fixed FML remapping issue (COULD CAUSE CRASHES). + * Small waste incinerator added. + * Lang files updated/corrections. + * Metal ladder easier to break. + ------------------------------------------------------------------- + [A] Added factory dropper (config:experimental). + [C] Thx to abdurraslan for the detailed issue #25. - - v1.0.5-b1 [A] Added passive fluid accumulator. - [A] Added small electrical passthrough-furnace. - [F] Fixed version check URL. - [M] Opt-out config options for valves, passive fluid accumulator, - and furni. + - v1.0.6-b1 [A] Added small waste incinerator (delayed fifo-buffered item disposal). + [M] Fixed item/block name capitalization (by Voxelo). + [M] Metal ladders are easier to break/harvest. + [F] Fixed FML remapping issue by using dedicated IItemHandler instances. - ------------------------------------------------------------------- - - v1.0.4 [R] Release based on v1.0.4-b9. Release-to-release changes: - * Crafting table: Quick crafting history re-fab, JEI integration. - * Rendering improvements and issue fixes (stairs, ambient occlusion, - optifine, etc). - * Walls with texture variations. - * Thin/thick steel poles with support feet/heads. - * Horizontal steel double-T support beams added. - * Fluid pipe valves added: Check valve, redstone controlled valve, - analog redstone controlled valve. Support pressurized transfer. - * Tool tip documentation (CTRL-SHIFT) for stairs added. - * Internal code cleanups. - * Recipes tuned. - ------------------------------------------------------------------- - [E] Added pass-through electrical furnace (experimental, see config). + ------------------------------------------------------------------- + - v1.0.5 [R] Release based on v1.0.5-b1. Release-to-release changes: + * Small electrical passthrough-furnace added. + * Passive fluid accumulator added. + * Config options added. + * Sign plates added. + * Minor bug fixes. + ------------------------------------------------------------------- + [A] Added sign "Electrical hazard"/"Caution hot wire". + [A] Added sign "Caution dangerous there" (skull/bones). - - v1.0.4-b9 [F] Inserting fluids with pressurized tag only into IE piping. - [F] Valve redstone connector rendering does not check for - "can connect redstone" but only for "can provide power". - [M] Valves are adapted to be detected as pipe by IE. + - v1.0.5-b1 [A] Added passive fluid accumulator. + [A] Added small electrical passthrough-furnace. + [F] Fixed version check URL. + [M] Opt-out config options for valves, passive fluid accumulator, + and furni. - - v1.0.4-b8 [F] Fixed stairs rendering without smooth light (thanks rastot9). - [E] Added passive fluid accumulator (experimental feature, see config). + ------------------------------------------------------------------- + - v1.0.4 [R] Release based on v1.0.4-b9. Release-to-release changes: + * Crafting table: Quick crafting history re-fab, JEI integration. + * Rendering improvements and issue fixes (stairs, ambient occlusion, + optifine, etc). + * Walls with texture variations. + * Thin/thick steel poles with support feet/heads. + * Horizontal steel double-T support beams added. + * Fluid pipe valves added: Check valve, redstone controlled valve, + analog redstone controlled valve. Support pressurized transfer. + * Tool tip documentation (CTRL-SHIFT) for stairs added. + * Internal code cleanups. + * Recipes tuned. + ------------------------------------------------------------------- + [E] Added pass-through electrical furnace (experimental, see config). - - v1.0.4-b7 [F] Fixed recipe loading issue if IE is not installed. - [M] Valves support IE pressurized fluid transfer. + - v1.0.4-b9 [F] Inserting fluids with pressurized tag only into IE piping. + [F] Valve redstone connector rendering does not check for + "can connect redstone" but only for "can provide power". + [M] Valves are adapted to be detected as pipe by IE. - - v1.0.4-b6 [A] Added redstone controlled fluid valve. - [A] Added redstone controlled analog fluid valve. - [M] Check valve recipe adapted (thanks majijn). + - v1.0.4-b8 [F] Fixed stairs rendering without smooth light (thanks rastot9). + [E] Added passive fluid accumulator (experimental feature, see config). - - v1.0.4-b5 [A] Horizontal steel double-T support beam with pole connections. - [A] Added fluid pipe check valve (straight, conducts only one way). - [M] Internal registration block/te handling changed. + - v1.0.4-b7 [F] Fixed recipe loading issue if IE is not installed. + [M] Valves support IE pressurized fluid transfer. - - v1.0.4-b4 [F] Clinker/slag brick wall side cullfacing disabled to prevent - texture leaks when connecting to concrete walls. - [F] Unused treated wood pole texture regions filled (optifine). - [F] Using mipped cutout format for window multi-layer model - (issue #19, thanks rixmswey for reporting and details). - [M] Recipe tuning, added standalone recipe for all mod blocks. - [M] In-game CTRL-SHIFT tooltip documentation updated. - [M] Panzer glass block: Ambient occlusion and light opacity tuned. - [M] Stairs: Light opacity tuned. - [A] Tooltip documentation added for mod stairs. - [E] Horizontal steel double-T support beam (config:experimental). + - v1.0.4-b6 [A] Added redstone controlled fluid valve. + [A] Added redstone controlled analog fluid valve. + [M] Check valve recipe adapted (thanks majijn). - - v1.0.4-b3 [A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles. - [A] Added support head/foot components for thin and thick steel poles. + - v1.0.4-b5 [A] Horizontal steel double-T support beam with pole connections. + [A] Added fluid pipe check valve (straight, conducts only one way). + [M] Internal registration block/te handling changed. - - v1.0.4-b2 [A] Added position dependent texture variation to clinker wall, - slag brick wall and rebar concrete wall. + - v1.0.4-b4 [F] Clinker/slag brick wall side cullfacing disabled to prevent + texture leaks when connecting to concrete walls. + [F] Unused treated wood pole texture regions filled (optifine). + [F] Using mipped cutout format for window multi-layer model + (issue #19, thanks rixmswey for reporting and details). + [M] Recipe tuning, added standalone recipe for all mod blocks. + [M] In-game CTRL-SHIFT tooltip documentation updated. + [M] Panzer glass block: Ambient occlusion and light opacity tuned. + [M] Stairs: Light opacity tuned. + [A] Tooltip documentation added for mod stairs. + [E] Horizontal steel double-T support beam (config:experimental). - - v1.0.4-b1 [A] Crafting table: JEI integration for recipe placement added. - [A] Crafting table: History re-fab added, allowing to quickly select - and re-craft recent recipes. Selection with arrow buttons, - ingredient placement by clicking the result slot. Automatic - item distribution on shift-click. Quick-move buttons. - [F] Crafting table textures modified to prevent optifine glitches - on the edges of the legs. + - v1.0.4-b3 [A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles. + [A] Added support head/foot components for thin and thick steel poles. - ------------------------------------------------------------------- - - v1.0.3 [R] Release based on v1.0.3-b5. Release-to-release changes: - * Small laboratory furnace added. - * Extensive config options for mod packing and tuning added. - * Rendering issues fixes (window bleeding, optifine). - * Steel framed window added. - * Treated wood pole "end pieces" added (two support variants). - * Sitting on treated wood stool added including mobs (but not - villagers, as these are obviously very upright people). - * Lang ru_ru added (github contribution from Yaroslavik). - * Creative tab logo changed to mod logo. - * Table/crafting table bounding boxes refined. - * Standalone "escape" recipes added if IE is not installed. - ------------------------------------------------------------------- + - v1.0.4-b2 [A] Added position dependent texture variation to clinker wall, + slag brick wall and rebar concrete wall. - - v1.0.3-b5 [F] Fixed typo in en-en lang file. - [F] Fixed IE concrete texture missing bailout in log if IE is not installed. - [F] Using forge multi-layer models for windows to circumvent glitches. - [M] Changed creative tab logo to the mod logo. - [A] Added alternative recipes for crafting table and furnace if main - IE ingredients are missing (for "stand-alone" mod usage). + - v1.0.4-b1 [A] Crafting table: JEI integration for recipe placement added. + [A] Crafting table: History re-fab added, allowing to quickly select + and re-craft recent recipes. Selection with arrow buttons, + ingredient placement by clicking the result slot. Automatic + item distribution on shift-click. Quick-move buttons. + [F] Crafting table textures modified to prevent optifine glitches + on the edges of the legs. - - v1.0.3-b4 [A] Lab furnace supports electrical speedup when a IE external - is placed in one of the two auxiliary slots. - [F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE). - [M] Updated ru_ru lang file (Yaroslavik). + ------------------------------------------------------------------- + - v1.0.3 [R] Release based on v1.0.3-b5. Release-to-release changes: + * Small laboratory furnace added. + * Extensive config options for mod packing and tuning added. + * Rendering issues fixes (window bleeding, optifine). + * Steel framed window added. + * Treated wood pole "end pieces" added (two support variants). + * Sitting on treated wood stool added including mobs (but not + villagers, as these are obviously very upright people). + * Lang ru_ru added (github contribution from Yaroslavik). + * Creative tab logo changed to mod logo. + * Table/crafting table bounding boxes refined. + * Standalone "escape" recipes added if IE is not installed. + ------------------------------------------------------------------- - - v1.0.3-b3 [A] Added sitting on treated wood stool, Zombies included. - [A] Added steel framed window. - [A] Added treated wood pole support head/foot and heavy duty support. - [A] Added language Russian language support, thanks to yaroslav4167. - [A] Added config for furnace smelting speed (percent of vanilla furnace). - [A] Added config for furnace fuel efficiency (in percent, ref is vanilla). - [F] Treated pole model changed to circumvent potential texture bleeding. - [M] Treated wood table bounding box aligned with the legs. - [M] Treated wood crafting table bounding box aligned with the legs. - [M] Treated wood window can be vertically placed for rooflights. + - v1.0.3-b5 [F] Fixed typo in en-en lang file. + [F] Fixed IE concrete texture missing bailout in log if IE is not installed. + [F] Using forge multi-layer models for windows to circumvent glitches. + [M] Changed creative tab logo to the mod logo. + [A] Added alternative recipes for crafting table and furnace if main + IE ingredients are missing (for "stand-alone" mod usage). - - v1.0.3-b2 [A] Added config options for selective feature opt-outs (soft opt-out). - [A] Added config skip registration of opt-out features (hard opt-out). - [A] Added config to disable all internal recipes (for packs). - [A] Added JEI API adapter for soft opt-outs. - [A] Added lab furnace recipe override config to smelt ores to nuggets + - v1.0.3-b4 [A] Lab furnace supports electrical speedup when a IE external + is placed in one of the two auxiliary slots. + [F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE). + [M] Updated ru_ru lang file (Yaroslavik). + + - v1.0.3-b3 [A] Added sitting on treated wood stool, Zombies included. + [A] Added steel framed window. + [A] Added treated wood pole support head/foot and heavy duty support. + [A] Added language Russian language support, thanks to yaroslav4167. + [A] Added config for furnace smelting speed (percent of vanilla furnace). + [A] Added config for furnace fuel efficiency (in percent, ref is vanilla). + [F] Treated pole model changed to circumvent potential texture bleeding. + [M] Treated wood table bounding box aligned with the legs. + [M] Treated wood crafting table bounding box aligned with the legs. + [M] Treated wood window can be vertically placed for rooflights. + + - v1.0.3-b2 [A] Added config options for selective feature opt-outs (soft opt-out). + [A] Added config skip registration of opt-out features (hard opt-out). + [A] Added config to disable all internal recipes (for packs). + [A] Added JEI API adapter for soft opt-outs. + [A] Added lab furnace recipe override config to smelt ores to nuggets that would normally be smelted into ingots. Can be changed on-the-fly. - - v1.0.3-b1 [A] Added small laboratory furnace. - [M] Panzer glass opacity/light level set explicitly 0. + - v1.0.3-b1 [A] Added small laboratory furnace. + [M] Panzer glass opacity/light level set explicitly 0. - ------------------------------------------------------------------- - - v1.0.2 [R] Release based on v1.0.2-b3 - * Fixes: Spawning. - * Crafting table: Shift-click. - * Ladders: Faster climbing/descending. - * Concrete: Rebar tiles, tile stairs. - * Treated wood: window, windowsill. - * Slag brick: wall. - * Panzer glass: added. - * Recipes: Adaptions, added decompositions. - ------------------------------------------------------------------- + ------------------------------------------------------------------- + - v1.0.2 [R] Release based on v1.0.2-b3 + * Fixes: Spawning. + * Crafting table: Shift-click. + * Ladders: Faster climbing/descending. + * Concrete: Rebar tiles, tile stairs. + * Treated wood: window, windowsill. + * Slag brick: wall. + * Panzer glass: added. + * Recipes: Adaptions, added decompositions. + ------------------------------------------------------------------- - - v1.0.2-b3 [A] Added slag brick wall. - [A] Added wall decomposition recipes. - [A] Added treated wood window. - [M] Climbing/descending mod ladders is faster when - looking up or down and not sneaking. - [M] Panzer glass material definition changed. - [M] Explicitly preventing spawning in and on "non-full" - blocks of the mod. + - v1.0.2-b3 [A] Added slag brick wall. + [A] Added wall decomposition recipes. + [A] Added treated wood window. + [M] Climbing/descending mod ladders is faster when + looking up or down and not sneaking. + [M] Panzer glass material definition changed. + [M] Explicitly preventing spawning in and on "non-full" + blocks of the mod. - - v1.0.2-b2 [A] Added rebar concrete tile stairs. - [A] Added treated wood window sill. - [A] Added decomposition recipes for stairs and tiles. - [M] Changed stair recipe yield quantity from 9 to 6. + - v1.0.2-b2 [A] Added rebar concrete tile stairs. + [A] Added treated wood window sill. + [A] Added decomposition recipes for stairs and tiles. + [M] Changed stair recipe yield quantity from 9 to 6. - - v1.0.2-b1 [A] Added rebar concrete tile. - [A] Added panzer glass (explosion-resistant reinforced glass). - [M] Treated wood crafting table supports shift-click to transfer - stacks between player inventory and crafting table storage - (thanks majijn for the hint). + - v1.0.2-b1 [A] Added rebar concrete tile. + [A] Added panzer glass (explosion-resistant reinforced glass). + [M] Treated wood crafting table supports shift-click to transfer + stacks between player inventory and crafting table storage + (thanks majijn for the hint). - ------------------------------------------------------------------- - - v1.0.1 [R] Release based on v1.0.1-b4 - * Treated wood crafting table - * Clinker brick wall - * Treated wood stool - * Inset spot light - * Recipe fixes - * Logo updated - ------------------------------------------------------------------- + ------------------------------------------------------------------- + - v1.0.1 [R] Release based on v1.0.1-b4 + * Treated wood crafting table + * Clinker brick wall + * Treated wood stool + * Inset spot light + * Recipe fixes + * Logo updated + ------------------------------------------------------------------- - - v1.0.1-b4 [M] Crafting table keeps inventory and has eight storage slots. - [M] Adapted inset light strength and harvest tool. - [M] Crafting table recipe adapted. + - v1.0.1-b4 [M] Crafting table keeps inventory and has eight storage slots. + [M] Adapted inset light strength and harvest tool. + [M] Crafting table recipe adapted. - - v1.0.1-b3 [A] Added inset light (glowstone-metal, light level like torch, - can be used as floor/ceiling/wall light). - [M] Crafting table model updated (issue #7, thanks majijn). - [M] Logo image updated. + - v1.0.1-b3 [A] Added inset light (glowstone-metal, light level like torch, + can be used as floor/ceiling/wall light). + [M] Crafting table model updated (issue #7, thanks majijn). + [M] Logo image updated. - - v1.0.1-b2 [A] Added treated wood crafting table. - [A] Added treated wood stool. - [F] Fixed ladder bounding boxes to allow climbing connected trap doors - (issue #6, thanks to Forgilageord). - [M] Improved wall-block connections (wall elements only connect to other - walls or gates, as well as to solid blocks if these blocks are in - a straight line with at least two wall elements). - [M] Decor walls are defined "solid" on top, so that e.g. torches and - redstone tracks can be placed on them. + - v1.0.1-b2 [A] Added treated wood crafting table. + [A] Added treated wood stool. + [F] Fixed ladder bounding boxes to allow climbing connected trap doors + (issue #6, thanks to Forgilageord). + [M] Improved wall-block connections (wall elements only connect to other + walls or gates, as well as to solid blocks if these blocks are in + a straight line with at least two wall elements). + [M] Decor walls are defined "solid" on top, so that e.g. torches and + redstone tracks can be placed on them. - - v1.0.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants. - [A] Added clinker brick wall. + - v1.0.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants. + [A] Added clinker brick wall. - ------------------------------------------------------------------- - - v1.0.0 [R] Release based on v1.0.0-b4 - ------------------------------------------------------------------- + ------------------------------------------------------------------- + - v1.0.0 [R] Release based on v1.0.0-b4 + ------------------------------------------------------------------- - - v1.0.0-b4 [F] Fixed vanished recipe for the rebar concrete wall. - [A] Concrete wall, material: IE concrete. + - v1.0.0-b4 [F] Fixed vanished recipe for the rebar concrete wall. + [A] Concrete wall, material: IE concrete. - - v1.0.0-b3 [A] Textures of rebar concrete and treated wood table improved. - [A] Added rebar concrete wall. + - v1.0.0-b3 [A] Textures of rebar concrete and treated wood table improved. + [A] Added rebar concrete wall. - - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof). + - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof). - - v1.0.0-b1 [A] Initial structure. - [A] Added clinker bricks and clinker brick stairs. - [A] Added slag bricks and slag brick stairs. - [A] Added metal rung ladder. - [A] Added staggered metal steps ladder. - [A] Added treated wood ladder. - [A] Added treated wood pole. - [A] Added treated wood table. + - v1.0.0-b1 [A] Initial structure. + [A] Added clinker bricks and clinker brick stairs. + [A] Added slag bricks and slag brick stairs. + [A] Added metal rung ladder. + [A] Added staggered metal steps ladder. + [A] Added treated wood ladder. + [A] Added treated wood pole. + [A] Added treated wood table. ---- diff --git a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java index 87a9e35..72f9f6e 100644 --- a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java @@ -8,7 +8,6 @@ */ package wile.engineersdecor; -import net.minecraft.item.crafting.IRecipe; import wile.engineersdecor.detail.*; import wile.engineersdecor.blocks.*; import wile.engineersdecor.items.*; @@ -21,6 +20,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.Item; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.network.IGuiHandler; @@ -78,6 +78,7 @@ public class ModEngineersDecor default void init(final FMLInitializationEvent e) {} default void postInit(final FMLPostInitializationEvent e) {} default World getWorlClientSide() { return null; } + default EntityPlayer getPlayerClientSide() { return null; } } //-------------------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java index 0c0abba..d8dae18 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java @@ -13,6 +13,7 @@ */ package wile.engineersdecor.blocks; +import net.minecraftforge.fml.common.Mod; import wile.engineersdecor.ModEngineersDecor; import wile.engineersdecor.detail.ModAuxiliaries; import net.minecraft.block.SoundType; @@ -30,6 +31,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.entity.Entity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; @@ -58,9 +60,15 @@ public class BlockDecor extends Block public static final long CFG_ANALOG = 0x0000000000040000L; // Denotes if a component has analog behaviour public static final long CFG_HARD_IE_DEPENDENT = 0x8000000000000000L; // Defines that this block abolutely needs IE to be installed. - protected final AxisAlignedBB aabb; + protected final AxisAlignedBB[] aabb; + + public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound) + { this(registryName, config, material, hardness, resistance, sound, (new AxisAlignedBB[]{FULL_BLOCK_AABB})); } public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nullable AxisAlignedBB boundingbox) + { this(registryName, config, material, hardness, resistance, sound, (boundingbox==null) ? (new AxisAlignedBB[]{FULL_BLOCK_AABB}) : (new AxisAlignedBB[]{boundingbox})); } + + public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB[] boundingboxes) { super((material!=null) ? (material) : (Material.IRON)); setCreativeTab(ModEngineersDecor.CREATIVE_TAB_ENGINEERSDECOR); @@ -74,12 +82,9 @@ public class BlockDecor extends Block // @todo double check that instance variable // not sure here ... if((config & CFG_TRANSLUCENT) != 0) this.translucent = true; this.config = config; - this.aabb = (boundingbox==null) ? (FULL_BLOCK_AABB) : (boundingbox); + this.aabb = boundingboxes; } - public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound) - { this(registryName, config, material, hardness, resistance, sound, null); } - @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) @@ -166,12 +171,19 @@ public class BlockDecor extends Block @Override @SuppressWarnings("deprecation") public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { return aabb; } + { return aabb[0]; } @SideOnly(Side.CLIENT) @SuppressWarnings("deprecation") - public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) - { return state.getBoundingBox(worldIn, pos).offset(pos); } + public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) + { return state.getBoundingBox(world, pos).offset(pos); } + + @SuppressWarnings("deprecation") + public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean isActualState) + { + addCollisionBoxToList(pos, entityBox, collidingBoxes, getBoundingBox(state, world, pos)); + for(int i=1; i Date: Sun, 7 Jul 2019 14:00:55 +0200 Subject: [PATCH 12/14] 1.14: Fixed additional block drops (issue #39). --- 1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java | 4 ++-- 1.14/gradle.properties | 2 +- 1.14/meta/update.json | 3 ++- 1.14/readme.md | 2 ++ meta/update.json | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java index d8dae18..ad0877d 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java @@ -1,5 +1,5 @@ /* - * @file BlockDecorFull.java + * @file BlockDecor.java * @author Stefan Wilhelm (wile) * @copyright (C) 2019 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) @@ -13,7 +13,6 @@ */ package wile.engineersdecor.blocks; -import net.minecraftforge.fml.common.Mod; import wile.engineersdecor.ModEngineersDecor; import wile.engineersdecor.detail.ModAuxiliaries; import net.minecraft.block.SoundType; @@ -32,6 +31,7 @@ import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.entity.Entity; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; diff --git a/1.14/gradle.properties b/1.14/gradle.properties index 34a5c5a..f42546c 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.14.3 version_forge_minecraft=1.14.3-27.0.25 version_fml_mappings=20190621-1.14.2 -version_engineersdecor=1.0.9-b2 +version_engineersdecor=1.0.9-b3 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/meta/update.json b/1.14/meta/update.json index 681de9e..9348a25 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.14.3": { + "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).", "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).", "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.", "1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.", @@ -12,6 +13,6 @@ }, "promos": { "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b2" + "1.14.3-latest": "1.0.9-b3" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index 43631e9..626ca86 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history + - v1.0.9-b3 [F] Additional item drop fixes when blocks are destroyed (issue #39). + - v1.0.9-b2 [U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2. [F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting). diff --git a/meta/update.json b/meta/update.json index fae2c27..4f89988 100644 --- a/meta/update.json +++ b/meta/update.json @@ -61,6 +61,7 @@ "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, "1.14.3": { + "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).", "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).", "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.", "1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.", @@ -76,6 +77,6 @@ "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b2" + "1.14.3-latest": "1.0.9-b3" } } \ No newline at end of file From a2e7fcac16b4df50a69b3a09bba1a757f454eaab Mon Sep 17 00:00:00 2001 From: stfwi Date: Sun, 7 Jul 2019 21:26:49 +0200 Subject: [PATCH 13/14] 1.14: Config skel ported (experimental), JEI integration ported (experimental, also addresses issue #38). --- .../assets/engineersdecor/lang/en_us.lang | 47 ++++++++++++++++- .../assets/engineersdecor/lang/ru_ru.lang | 47 ++++++++++++++++- .../assets/engineersdecor/lang/zh_cn.lang | 47 ++++++++++++++++- 1.14/build.gradle | 51 +++++++++---------- 1.14/gradle.properties | 3 +- 1.14/meta/update.json | 3 +- 1.14/readme.md | 4 ++ meta/update.json | 3 +- 8 files changed, 172 insertions(+), 33 deletions(-) diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang index 98be598..aca7830 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang @@ -5,7 +5,6 @@ # #----------------------------------------------------------------------------------------------------------- itemGroup.tabengineersdecor=Engineer's Decor -engineersdecor.config.title=Engineer's Decor Config engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r More Info§6]§r engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Help§6]§r engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab. @@ -182,6 +181,52 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. + +#----------------------------------------------------------------------------------------------------------- +engineersdecor.config.title=Engineer's Decor Config +engineersdecor.config.pattern_excludes=Pattern excludes +engineersdecor.config.pattern_includes=Pattern includes +engineersdecor.config.without_clinker_bricks=Without clinker bricks +engineersdecor.config.without_slag_bricks=Without slag bricks +engineersdecor.config.without_rebar_concrete=Without rebar concrete +engineersdecor.config.without_walls=Without walls +engineersdecor.config.without_stairs=Without stairs +engineersdecor.config.without_ie_concrete_wall=Without concrete wall +engineersdecor.config.without_panzer_glass=Without panzer glass +engineersdecor.config.without_crafting_table=Without crafting table +engineersdecor.config.without_lab_furnace=Without lab furnace +engineersdecor.config.without_electrical_furnace=Without electrical furnace +engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture +engineersdecor.config.without_windows=Without windows +engineersdecor.config.without_light_sources=Without lights +engineersdecor.config.without_ladders=Without ladders +engineersdecor.config.without_chair_sitting=Without chair sitting +engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting +engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost +engineersdecor.config.without_crafting_table_history=Without crafting table history +engineersdecor.config.without_valves=Without valves +engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator +engineersdecor.config.without_waste_incinerator=Without waste incinerator +engineersdecor.config.without_sign_plates=Without signs +engineersdecor.config.without_factory_dropper=Without factory dropper +engineersdecor.config.without_slabs=Without slabs +engineersdecor.config.without_halfslabs=Without slab slices +engineersdecor.config.without_direct_slab_pickup=Without slab pickup +engineersdecor.config.without_poles=Without poles +engineersdecor.config.without_hsupports=Without h. supports +engineersdecor.config.without_tooltips=Without tooltips +engineersdecor.config.without_recipes=Without recipes +engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed % +engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency % +engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy +engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance % +engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %" +engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons +engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate +engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope +engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed % +engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption + #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 912937e..7a5e9fb 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -5,7 +5,6 @@ # #----------------------------------------------------------------------------------------------------------- itemGroup.tabengineersdecor=Engineer's Decor -engineersdecor.config.title=Engineer's Decor конфигурация engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r Больше информации§6]§r engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Помощь§6]§r #engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab. @@ -177,6 +176,52 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Часть золотого л tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Часть алюминиевого листового металла tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. + +#----------------------------------------------------------------------------------------------------------- +engineersdecor.config.title=Engineer's Decor конфигурация +engineersdecor.config.pattern_excludes=Pattern excludes +engineersdecor.config.pattern_includes=Pattern includes +engineersdecor.config.without_clinker_bricks=Without clinker bricks +engineersdecor.config.without_slag_bricks=Without slag bricks +engineersdecor.config.without_rebar_concrete=Without rebar concrete +engineersdecor.config.without_walls=Without walls +engineersdecor.config.without_stairs=Without stairs +engineersdecor.config.without_ie_concrete_wall=Without concrete wall +engineersdecor.config.without_panzer_glass=Without panzer glass +engineersdecor.config.without_crafting_table=Without crafting table +engineersdecor.config.without_lab_furnace=Without lab furnace +engineersdecor.config.without_electrical_furnace=Without electrical furnace +engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture +engineersdecor.config.without_windows=Without windows +engineersdecor.config.without_light_sources=Without lights +engineersdecor.config.without_ladders=Without ladders +engineersdecor.config.without_chair_sitting=Without chair sitting +engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting +engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost +engineersdecor.config.without_crafting_table_history=Without crafting table history +engineersdecor.config.without_valves=Without valves +engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator +engineersdecor.config.without_waste_incinerator=Without waste incinerator +engineersdecor.config.without_sign_plates=Without signs +engineersdecor.config.without_factory_dropper=Without factory dropper +engineersdecor.config.without_slabs=Without slabs +engineersdecor.config.without_halfslabs=Without slab slices +engineersdecor.config.without_direct_slab_pickup=Without slab pickup +engineersdecor.config.without_poles=Without poles +engineersdecor.config.without_hsupports=Without h. supports +engineersdecor.config.without_tooltips=Without tooltips +engineersdecor.config.without_recipes=Without recipes +engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed % +engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency % +engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy +engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance % +engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %" +engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons +engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate +engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope +engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed % +engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption + #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang index 1d227a7..43890fd 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang @@ -5,7 +5,6 @@ # #----------------------------------------------------------------------------------------------------------- itemGroup.tabengineersdecor=工程师的装饰 -engineersdecor.config.title=工程师的装饰配置 engineersdecor.tooltip.hint.extended=§6[按§9SHIFT§r获取更多信息§6]§r engineersdecor.tooltip.hint.help=§6[按§9CTRL-SHIFT§r获取帮助§6]§r #engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab. @@ -180,6 +179,52 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice #tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice #tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. + +#----------------------------------------------------------------------------------------------------------- +engineersdecor.config.title=工程师的装饰配置 +engineersdecor.config.pattern_excludes=Pattern excludes +engineersdecor.config.pattern_includes=Pattern includes +engineersdecor.config.without_clinker_bricks=Without clinker bricks +engineersdecor.config.without_slag_bricks=Without slag bricks +engineersdecor.config.without_rebar_concrete=Without rebar concrete +engineersdecor.config.without_walls=Without walls +engineersdecor.config.without_stairs=Without stairs +engineersdecor.config.without_ie_concrete_wall=Without concrete wall +engineersdecor.config.without_panzer_glass=Without panzer glass +engineersdecor.config.without_crafting_table=Without crafting table +engineersdecor.config.without_lab_furnace=Without lab furnace +engineersdecor.config.without_electrical_furnace=Without electrical furnace +engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture +engineersdecor.config.without_windows=Without windows +engineersdecor.config.without_light_sources=Without lights +engineersdecor.config.without_ladders=Without ladders +engineersdecor.config.without_chair_sitting=Without chair sitting +engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting +engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost +engineersdecor.config.without_crafting_table_history=Without crafting table history +engineersdecor.config.without_valves=Without valves +engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator +engineersdecor.config.without_waste_incinerator=Without waste incinerator +engineersdecor.config.without_sign_plates=Without signs +engineersdecor.config.without_factory_dropper=Without factory dropper +engineersdecor.config.without_slabs=Without slabs +engineersdecor.config.without_halfslabs=Without slab slices +engineersdecor.config.without_direct_slab_pickup=Without slab pickup +engineersdecor.config.without_poles=Without poles +engineersdecor.config.without_hsupports=Without h. supports +engineersdecor.config.without_tooltips=Without tooltips +engineersdecor.config.without_recipes=Without recipes +engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed % +engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency % +engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy +engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance % +engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %" +engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons +engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate +engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope +engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed % +engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption + #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.14/build.gradle b/1.14/build.gradle index 7a2a47d..406d07a 100644 --- a/1.14/build.gradle +++ b/1.14/build.gradle @@ -19,20 +19,25 @@ version = "${version_engineersdecor}" group = "wile.engineersdecor" archivesBaseName = "engineersdecor-${version_minecraft}" -// def signing = { -> -// def sp = new Properties() -// if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } -// return sp -// }() +def signing = { -> + def sp = new Properties() + if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } + return sp +}() -// def git_version = { -> -// def stdout = new ByteArrayOutputStream() -// exec { -// commandLine 'git', 'log', '-1', '--format=%h' -// standardOutput = stdout -// } -// return stdout.toString().trim() -// }() +def git_version = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'log', '-1', '--format=%h' + standardOutput = stdout + } + return stdout.toString().trim() +}() + +repositories { + maven { name = "Progwml6 maven"; url = "https://dvs1.progwml6.com/files/maven/" } // JEI files + maven { name = "ModMaven"; url = "modmaven.k-4u.nl" } // JEI files, fallback +} minecraft { mappings channel: 'snapshot', version: "${version_fml_mappings}" @@ -63,6 +68,8 @@ minecraft { dependencies { minecraft "net.minecraftforge:forge:${version_forge_minecraft}" + compileOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}:api") + runtimeOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}") } jar { @@ -80,19 +87,9 @@ jar { } def reobfFile = file("$buildDir/reobfJar/output.jar") -def reobfArtifact = artifacts.add('default', reobfFile) { - type 'jar' - builtBy 'reobfJar' -} +def reobfArtifact = artifacts.add('default', reobfFile) { type 'jar'; builtBy 'reobfJar'; } + publishing { - publications { - mavenJava(MavenPublication) { - artifact reobfArtifact - } - } - repositories { - maven { - url "file:///${project.projectDir}/mcmodsrepo" - } - } + publications { mavenJava(MavenPublication) { artifact reobfArtifact } } + repositories { maven { url "file:///${project.projectDir}/mcmodsrepo" } } } diff --git a/1.14/gradle.properties b/1.14/gradle.properties index f42546c..e67bc88 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -4,7 +4,8 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.14.3 version_forge_minecraft=1.14.3-27.0.25 version_fml_mappings=20190621-1.14.2 -version_engineersdecor=1.0.9-b3 +version_jei=6.0.0.7 +version_engineersdecor=1.0.9-b4 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/meta/update.json b/1.14/meta/update.json index 9348a25..6d15301 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.14.3": { + "1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).", "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).", "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).", "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.", @@ -13,6 +14,6 @@ }, "promos": { "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b3" + "1.14.3-latest": "1.0.9-b4" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index 626ca86..9a5756b 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,6 +10,10 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history + - v1.0.9-b4 [E] Experimental: Config skel ported (!not all options have effect yet). + [E] Experimental: JEI integration for opt-outs and crafting table ported + (also addresses issue #38). + - v1.0.9-b3 [F] Additional item drop fixes when blocks are destroyed (issue #39). - v1.0.9-b2 [U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2. diff --git a/meta/update.json b/meta/update.json index 4f89988..946d706 100644 --- a/meta/update.json +++ b/meta/update.json @@ -61,6 +61,7 @@ "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, "1.14.3": { + "1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).", "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).", "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).", "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.", @@ -77,6 +78,6 @@ "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b3" + "1.14.3-latest": "1.0.9-b4" } } \ No newline at end of file From 547912aaa4afecb3548136945f8cce914b39d2ec Mon Sep 17 00:00:00 2001 From: stfwi Date: Sun, 7 Jul 2019 21:58:17 +0200 Subject: [PATCH 14/14] 1.12: Release commit v1.0.9-mc1.12.2. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 5 +++-- 1.12/readme.md | 8 +------- meta/update.json | 5 +++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/1.12/gradle.properties b/1.12/gradle.properties index f1f2d83..aff41d6 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.10-b1 +version_engineersdecor=1.0.9 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 5e901fa..3e70560 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.", "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", @@ -46,7 +47,7 @@ "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table." }, "promos": { - "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.9-b3" + "1.12.2-recommended": "1.0.9", + "1.12.2-latest": "1.0.9" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 7b2bca2..6fef5a9 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,14 +10,8 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - ~ v1.0.10-b1 [I] Features WIP - [A] Treated wood side table added. - [F] Fixed recipe collision of Metal Rung Ladder (issue #37, - thx ProsperCraft for reporting). - ------------------------------------------------------------------- - ~ v1.0.9 [T] In release test. - [R] Release based on v1.0.9-b3. Release-to-release changes: + - v1.0.9 [R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. diff --git a/meta/update.json b/meta/update.json index 946d706..16d3de6 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.", "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", "1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).", @@ -73,8 +74,8 @@ "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks." }, "promos": { - "1.12.2-recommended": "1.0.8", - "1.12.2-latest": "1.0.9-b3", + "1.12.2-recommended": "1.0.9", + "1.12.2-latest": "1.0.9", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.3-recommended": "",