From bf99b3a2e01f443364b21c8a4f881ffa057478dd Mon Sep 17 00:00:00 2001 From: stfwi Date: Sun, 15 Dec 2019 10:26:10 +0100 Subject: [PATCH] Added reverse recipes for slab slices, Inset Floor Edge Light model slightly thinner. --- 1.12/gradle.properties | 2 +- 1.12/readme.md | 3 ++ .../block/light/floor_edge_light_model.json | 41 ++++-------------- .../halfslab_concrete_recipe_decompose.json | 22 ++++++++++ ..._sheetmetal_aluminum_recipe_decompose.json | 22 ++++++++++ ...ab_sheetmetal_copper_recipe_decompose.json | 22 ++++++++++ ...slab_sheetmetal_gold_recipe_decompose.json | 22 ++++++++++ ...slab_sheetmetal_iron_recipe_decompose.json | 22 ++++++++++ ...lab_sheetmetal_steel_recipe_decompose.json | 22 ++++++++++ ...alfslab_treated_wood_recipe_decompose.json | 22 ++++++++++ .../clinker_brick_slab_recipe_decompose.json | 21 +++++++++ ...brick_stained_block_recipe_decompose.json} | 0 ...r_brick_stained_slab_recipe_decompose.json | 21 +++++++++ .../gas_concrete_slab_recipe_decompose.json | 21 +++++++++ ...alfslab_gas_concrete_recipe_decompose.json | 21 +++++++++ ...fslab_rebar_concrete_recipe_decompose.json | 21 +++++++++ .../panzerglass_slab_recipe_decompose.json | 21 +++++++++ .../rebar_concrete_slab_recipe_decompose.json | 21 +++++++++ ...r_concrete_tile_slab_recipe_decompose.json | 21 +++++++++ 1.14/gradle.properties | 2 +- 1.14/readme.md | 3 ++ .../block/light/floor_edge_light_model.json | 43 +++++-------------- .../clinker_brick_slab_recipe.json | 2 - ..._brick_stained_block_recipe_decompose.json | 16 +++++++ .../clinker_brick_stained_slab_recipe.json | 2 - ...r_brick_stained_slab_recipe_decompose.json | 21 +++++++++ ...as_concrete_halfslab_recipe_decompose.json | 23 ++++++++++ .../independent/gas_concrete_slab_recipe.json | 2 - .../gas_concrete_slab_recipe_decompose.json | 21 +++++++++ ...ar_concrete_halfslab_recipe_decompose.json | 23 ++++++++++ .../rebar_concrete_slab_recipe.json | 2 - .../rebar_concrete_slab_recipe_decompose.json | 23 ++++++++++ ...r_concrete_tile_slab_recipe_decompose.json | 23 ++++++++++ 33 files changed, 499 insertions(+), 75 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_concrete_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_aluminum_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_copper_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_gold_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_iron_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_steel_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_treated_wood_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_slab_recipe_decompose.json rename 1.12/src/main/resources/assets/engineersdecor/recipes/independent/{clinker_brick_stained_block_recipe_reverse.json => clinker_brick_stained_block_recipe_decompose.json} (100%) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_gas_concrete_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_rebar_concrete_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/panzerglass_slab_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_halfslab_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_halfslab_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json create mode 100644 1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 8b1cc0a..3e9f3cd 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.17-b1 +version_engineersdecor=1.0.17-b2 diff --git a/1.12/readme.md b/1.12/readme.md index 990695b..fac7d45 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history + ~ v1.0.17-b2 [A] Reverse recipes for slabs and slab slices added. + [M] Inset Floor Edge Light slightly thinner, looks better. + - v1.0.17-b1 [A] Added Milking Machine. [M] Window placement improved. [M] Made Pipe Valve textures slightly darker to fit IE pipes better when shaded. diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json index 481e6c9..1b925bf 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json @@ -7,8 +7,9 @@ }, "elements": [ { - "from": [6, 0.1875, 0.5], - "to": [10, 1.8125, 1], + "from": [6, 0, 0], + "to": [10, 1.8125, 0.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.5]}, "faces": { "north": {"uv": [6, 14.1875, 10, 15.8125], "texture": "#light"}, "south": {"uv": [6, 14.1875, 10, 15.8125], "texture": "#light"}, @@ -16,9 +17,9 @@ } }, { - "from": [10, 0.1875, 0.5], - "to": [11, 1.8125, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.125]}, + "from": [10, 0, 0], + "to": [11, 1.8125, 0.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.625]}, "faces": { "north": {"uv": [5, 14.1875, 6, 15.8125], "texture": "#side"}, "east": {"uv": [15, 14.1875, 15.5, 15.8125], "texture": "#side"}, @@ -29,9 +30,9 @@ } }, { - "from": [5, 0.1875, 0.5], - "to": [6, 1.8125, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.125]}, + "from": [5, 0, 0], + "to": [6, 1.8125, 0.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.625]}, "faces": { "north": {"uv": [10, 14.1875, 11, 15.8125], "texture": "#side"}, "east": {"uv": [15, 14.1875, 15.5, 15.8125], "texture": "#side"}, @@ -40,30 +41,6 @@ "up": {"uv": [5, 0.5, 6, 1], "texture": "#side"}, "down": {"uv": [5, 15, 6, 15.5], "texture": "#side"} } - }, - { - "from": [5, 0, 0], - "to": [11, 2, 0.5], - "faces": { - "north": {"uv": [5, 14, 11, 16], "texture": "#side"}, - "east": {"uv": [15.5, 14, 16, 16], "texture": "#side"}, - "south": {"uv": [5, 14, 11, 16], "texture": "#side"}, - "west": {"uv": [0, 14, 0.5, 16], "texture": "#side"}, - "up": {"uv": [5, 0, 11, 0.5], "texture": "#side"}, - "down": {"uv": [5, 15.5, 11, 16], "texture": "#side"} - } - }, - { - "from": [5, 0, 0.5], - "to": [11, 0.1875, 1], - "faces": { - "north": {"uv": [5, 15.8125, 11, 16], "texture": "#side"}, - "east": {"uv": [15, 15.8125, 15.5, 16], "texture": "#side"}, - "south": {"uv": [5, 15.8125, 11, 16], "texture": "#side"}, - "west": {"uv": [0.5, 15.8125, 1, 16], "texture": "#side"}, - "up": {"uv": [5, 0.5, 11, 1], "texture": "#side"}, - "down": {"uv": [5, 15, 11, 15.5], "texture": "#side"} - } } ], "display": { diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_concrete_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_concrete_recipe_decompose.json new file mode 100644 index 0000000..a3ae121 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_concrete_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:stone_decoration", + "required": ["engineersdecor:halfslab_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_concrete" } + }, + "result": { + "item": "immersiveengineering:stone_decoration_slab", + "data": 5, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_aluminum_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_aluminum_recipe_decompose.json new file mode 100644 index 0000000..3a72536 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_aluminum_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:sheetmetal_slab", + "required": ["engineersdecor:halfslab_sheetmetal_aluminum"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_sheetmetal_aluminum" } + }, + "result": { + "item": "immersiveengineering:sheetmetal_slab", + "data": 1, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_copper_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_copper_recipe_decompose.json new file mode 100644 index 0000000..1eba742 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_copper_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:sheetmetal_slab", + "required": ["engineersdecor:halfslab_sheetmetal_copper"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_sheetmetal_copper" } + }, + "result": { + "item": "immersiveengineering:sheetmetal_slab", + "data": 0, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_gold_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_gold_recipe_decompose.json new file mode 100644 index 0000000..1ddacba --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_gold_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:sheetmetal_slab", + "required": ["engineersdecor:halfslab_sheetmetal_gold"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_sheetmetal_gold" } + }, + "result": { + "item": "immersiveengineering:sheetmetal_slab", + "data": 10, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_iron_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_iron_recipe_decompose.json new file mode 100644 index 0000000..d69424b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_iron_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:sheetmetal_slab", + "required": ["engineersdecor:halfslab_sheetmetal_iron"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_sheetmetal_iron" } + }, + "result": { + "item": "immersiveengineering:sheetmetal_slab", + "data": 9, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_steel_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_steel_recipe_decompose.json new file mode 100644 index 0000000..c3f11a8 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_sheetmetal_steel_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:sheetmetal_slab", + "required": ["engineersdecor:halfslab_sheetmetal_steel"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_sheetmetal_steel" } + }, + "result": { + "item": "immersiveengineering:sheetmetal_slab", + "data": 8, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_treated_wood_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_treated_wood_recipe_decompose.json new file mode 100644 index 0000000..ee06a5d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/dependent/halfslab_treated_wood_recipe_decompose.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "immersiveengineering:treated_wood_slab", + "required": ["engineersdecor:halfslab_treated_wood"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_treated_wood" } + }, + "result": { + "item": "immersiveengineering:treated_wood_slab", + "data": 0, + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_slab_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_slab_recipe_decompose.json new file mode 100644 index 0000000..1114b39 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:clinker_brick_slab" } + }, + "result": { + "item": "engineersdecor:clinker_brick_block", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_reverse.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_decompose.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_reverse.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_decompose.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json new file mode 100644 index 0000000..0090647 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:clinker_brick_stained_block", + "required": ["engineersdecor:clinker_brick_stained_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:clinker_brick_stained_slab" } + }, + "result": { + "item": "engineersdecor:clinker_brick_stained_block", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json new file mode 100644 index 0000000..05310c2 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:gas_concrete", + "required": ["engineersdecor:gas_concrete_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:gas_concrete_slab" } + }, + "result": { + "item": "engineersdecor:gas_concrete", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_gas_concrete_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_gas_concrete_recipe_decompose.json new file mode 100644 index 0000000..a0c31aa --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_gas_concrete_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:gas_concrete_slab", + "required": ["engineersdecor:halfslab_gas_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_gas_concrete" } + }, + "result": { + "item": "engineersdecor:gas_concrete_slab", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_rebar_concrete_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_rebar_concrete_recipe_decompose.json new file mode 100644 index 0000000..86698b0 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/halfslab_rebar_concrete_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:rebar_concrete_slab", + "required": ["engineersdecor:halfslab_rebar_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:halfslab_rebar_concrete" } + }, + "result": { + "item": "engineersdecor:rebar_concrete_slab", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/panzerglass_slab_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/panzerglass_slab_recipe_decompose.json new file mode 100644 index 0000000..cb12178 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/panzerglass_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:panzerglass_block", + "required": ["engineersdecor:panzerglass_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:panzerglass_slab" } + }, + "result": { + "item": "engineersdecor:panzerglass_block", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json new file mode 100644 index 0000000..4d22b56 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:rebar_concrete_slab" } + }, + "result": { + "item": "engineersdecor:rebar_concrete", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json new file mode 100644 index 0000000..2cd1807 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:rebar_concrete_tile", + "required": ["engineersdecor:rebar_concrete_tile_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:rebar_concrete_tile_slab" } + }, + "result": { + "item": "engineersdecor:rebar_concrete_tile", + "count": 1 + } +} diff --git a/1.14/gradle.properties b/1.14/gradle.properties index d25f2a8..676a952 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -5,4 +5,4 @@ version_minecraft=1.14.4 version_forge_minecraft=1.14.4-28.1.104 version_fml_mappings=20190719-1.14.3 version_jei=1.14.4:6.0.0.10 -version_engineersdecor=1.0.17-b1 +version_engineersdecor=1.0.17-b2 diff --git a/1.14/readme.md b/1.14/readme.md index 14b7821..2ccbe34 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.14.4. ## Version history + ~ v1.0.17-b2 [A] Reverse recipes for slabs and slab slices added. + [M] Inset Floor Edge Light slightly thinner, looks better. + - v1.0.17-b1 [A] Added Milking Machine. [A] Added Mineral Smelter gravity fluid transfer. [M] Window placement improved. diff --git a/1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json b/1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json index e60e356..5662d6f 100644 --- a/1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json +++ b/1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json @@ -7,8 +7,9 @@ }, "elements": [ { - "from": [6, 0.1875, 0.5], - "to": [10, 1.8125, 1], + "from": [6, 0, 0], + "to": [10, 1.8125, 0.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.5]}, "faces": { "north": {"uv": [6, 14.1875, 10, 15.8125], "texture": "#light"}, "south": {"uv": [6, 14.1875, 10, 15.8125], "texture": "#light"}, @@ -16,9 +17,9 @@ } }, { - "from": [10, 0.1875, 0.5], - "to": [11, 1.8125, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.125]}, + "from": [10, 0, 0], + "to": [11, 1.8125, 0.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.625]}, "faces": { "north": {"uv": [5, 14.1875, 6, 15.8125], "texture": "#side"}, "east": {"uv": [15, 14.1875, 15.5, 15.8125], "texture": "#side"}, @@ -29,9 +30,9 @@ } }, { - "from": [5, 0.1875, 0.5], - "to": [6, 1.8125, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.125]}, + "from": [5, 0, 0], + "to": [6, 1.8125, 0.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.625]}, "faces": { "north": {"uv": [10, 14.1875, 11, 15.8125], "texture": "#side"}, "east": {"uv": [15, 14.1875, 15.5, 15.8125], "texture": "#side"}, @@ -40,30 +41,6 @@ "up": {"uv": [5, 0.5, 6, 1], "texture": "#side"}, "down": {"uv": [5, 15, 6, 15.5], "texture": "#side"} } - }, - { - "from": [5, 0, 0], - "to": [11, 2, 0.5], - "faces": { - "north": {"uv": [5, 14, 11, 16], "texture": "#side"}, - "east": {"uv": [15.5, 14, 16, 16], "texture": "#side"}, - "south": {"uv": [5, 14, 11, 16], "texture": "#side"}, - "west": {"uv": [0, 14, 0.5, 16], "texture": "#side"}, - "up": {"uv": [5, 0, 11, 0.5], "texture": "#side"}, - "down": {"uv": [5, 15.5, 11, 16], "texture": "#side"} - } - }, - { - "from": [5, 0, 0.5], - "to": [11, 0.1875, 1], - "faces": { - "north": {"uv": [5, 15.8125, 11, 16], "texture": "#side"}, - "east": {"uv": [15, 15.8125, 15.5, 16], "texture": "#side"}, - "south": {"uv": [5, 15.8125, 11, 16], "texture": "#side"}, - "west": {"uv": [0.5, 15.8125, 1, 16], "texture": "#side"}, - "up": {"uv": [5, 0.5, 11, 1], "texture": "#side"}, - "down": {"uv": [5, 15, 11, 15.5], "texture": "#side"} - } } ], "display": { @@ -76,7 +53,7 @@ "translation": [-3, -0.75, 1.25] }, "ground": { - "translation": [0, 2.5, 6], + "translation": [0, 1.75, 0], "scale": [0.7, 0.7, 0.7] }, "gui": { diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_slab_recipe.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_slab_recipe.json index e418fa7..cb2376e 100644 --- a/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_slab_recipe.json +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_slab_recipe.json @@ -8,8 +8,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", - " ", "CCC" ], "key": { diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_decompose.json new file mode 100644 index 0000000..285cd9e --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_block_recipe_decompose.json @@ -0,0 +1,16 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_stained_block"] + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:clinker_brick_stained_block" } + ], + "result": { + "item": "engineersdecor:clinker_brick_block" + } +} diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe.json index f62ae91..9ce280b 100644 --- a/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe.json +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe.json @@ -8,8 +8,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", - " ", "CCC" ], "key": { diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json new file mode 100644 index 0000000..403ddc8 --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_stained_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:clinker_brick_stained_block", + "required": ["engineersdecor:clinker_brick_stained_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:clinker_brick_stained_slab" } + }, + "result": { + "item": "engineersdecor:clinker_brick_stained_block", + "count": 1 + } +} diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_halfslab_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_halfslab_recipe_decompose.json new file mode 100644 index 0000000..2786d4b --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_halfslab_recipe_decompose.json @@ -0,0 +1,23 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:gas_concrete_slab", + "required": ["engineersdecor:halfslab_gas_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "engineersdecor:halfslab_gas_concrete" + } + }, + "result": { + "item": "engineersdecor:gas_concrete_slab", + "count": 1 + } +} diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe.json index d048dd6..61d527e 100644 --- a/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe.json +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe.json @@ -8,8 +8,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", - " ", "CCC" ], "key": { diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json new file mode 100644 index 0000000..0500125 --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/gas_concrete_slab_recipe_decompose.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:gas_concrete", + "required": ["engineersdecor:gas_concrete_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:gas_concrete_slab" } + }, + "result": { + "item": "engineersdecor:gas_concrete", + "count": 1 + } +} diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_halfslab_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_halfslab_recipe_decompose.json new file mode 100644 index 0000000..4f19821 --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_halfslab_recipe_decompose.json @@ -0,0 +1,23 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:rebar_concrete_slab", + "required": ["engineersdecor:halfslab_rebar_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "engineersdecor:halfslab_rebar_concrete" + } + }, + "result": { + "item": "engineersdecor:rebar_concrete_slab", + "count": 1 + } +} diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe.json index 724fc43..378be87 100644 --- a/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe.json +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe.json @@ -8,8 +8,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", - " ", "CCC" ], "key": { diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json new file mode 100644 index 0000000..cba362c --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_slab_recipe_decompose.json @@ -0,0 +1,23 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "C", + "C" + ], + "key": { + "C": { + "item": "engineersdecor:rebar_concrete_slab" + } + }, + "result": { + "item": "engineersdecor:rebar_concrete", + "count": 1 + } +} diff --git a/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json new file mode 100644 index 0000000..28f06e7 --- /dev/null +++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/rebar_concrete_tile_slab_recipe_decompose.json @@ -0,0 +1,23 @@ +{ + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:rebar_concrete_tile", + "required": ["engineersdecor:rebar_concrete_tile_slab"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "C", + "C" + ], + "key": { + "C": { + "item": "engineersdecor:rebar_concrete_tile_slab" + } + }, + "result": { + "item": "engineersdecor:rebar_concrete_tile", + "count": 1 + } +}