From 40c85bb244ead5f54b62be3a0dce93128dde6ae5 Mon Sep 17 00:00:00 2001 From: Voidsong Dragonfly Date: Sun, 7 Jan 2024 23:24:56 -0500 Subject: [PATCH] Add in manual entries & stonecutting recipe for slag brick --- .../immersiveengineering/data/Recipes.java | 1 + .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 +- .../recipes/misc/stonecutting/slag_brick.json | 35 +++++++++++++ .../recipes/stonecutting/slag_brick.json | 8 +++ .../immersiveengineering/manual/autoload.json | 1 + .../manual/clinker_brick.json | 51 +++++++++++++++++++ .../manual/en_us/clinker_brick.txt | 12 +++++ .../manual/en_us/concrete.txt | 2 + .../manual/en_us/slag.txt | 13 +++-- .../immersiveengineering/manual/slag.json | 17 +++++++ 10 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 src/generated/resources/data/immersiveengineering/advancements/recipes/misc/stonecutting/slag_brick.json create mode 100644 src/generated/resources/data/immersiveengineering/recipes/stonecutting/slag_brick.json create mode 100644 src/main/resources/assets/immersiveengineering/manual/clinker_brick.json create mode 100644 src/main/resources/assets/immersiveengineering/manual/en_us/clinker_brick.txt diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java b/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java index 825cf81f2d..35ff4a115d 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java @@ -1580,6 +1580,7 @@ private void recipesStoneDecorations(@Nonnull Consumer out) addWall(StoneDecoration.SLAG_BRICK, out); addWall(StoneDecoration.CLINKER_BRICK, out); + addStonecuttingRecipe(Ingredients.SLAG, StoneDecoration.SLAG_BRICK, out); addStonecuttingRecipe(StoneDecoration.SLAG_BRICK, IEBlocks.TO_SLAB.get(StoneDecoration.SLAG_BRICK.getId()), 2, out); addStonecuttingRecipe(StoneDecoration.SLAG_BRICK, IEBlocks.TO_STAIRS.get(StoneDecoration.SLAG_BRICK.getId()), out); addStonecuttingRecipe(StoneDecoration.SLAG_BRICK, IEBlocks.TO_WALL.get(StoneDecoration.SLAG_BRICK.getId()), out); diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 2ec550097c..4c29fdf8c0 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-07T22:48:27.943662983 Recipes +// 1.20.1 2024-01-07T23:02:20.945788067 Recipes 11eec1c90c86322604ee56b59c32dead974ae804 data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick.json 351a01207bf89c71c2e95884864d365cd5d7a23d data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick_from_slab.json 3aae30cf5b8337fcdd006bd53b3269616a8893ec data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick_to_slab.json @@ -553,6 +553,7 @@ b2f15ee0a3a441a3ae7a294241965ed5be96f28f data/immersiveengineering/advancements/ 04f63814231594ab31c6c2b0bbc989055b96f7a5 data/immersiveengineering/advancements/recipes/misc/stonecutting/slab_hempcrete.json 60fc9871c4054dacd5a9ffc99720e3b706ff9500 data/immersiveengineering/advancements/recipes/misc/stonecutting/slab_hempcrete_brick.json 924953b338ecb85d2026d71fe8c0fbde67674a37 data/immersiveengineering/advancements/recipes/misc/stonecutting/slab_slag_brick.json +f5442f8a0c65cded05eb5eea682566c49cbedee4 data/immersiveengineering/advancements/recipes/misc/stonecutting/slag_brick.json 7f34ab8ecee365797c646335e895ce4a3a88a847 data/immersiveengineering/advancements/recipes/misc/stonecutting/stairs_clinker_brick.json 724ebed97d9ad60fd7cad5349b097a48b91f98c8 data/immersiveengineering/advancements/recipes/misc/stonecutting/stairs_concrete.json 41c66dfb64a1f2656c7900840fa17cfe1900ca74 data/immersiveengineering/advancements/recipes/misc/stonecutting/stairs_concrete_brick.json @@ -1646,6 +1647,7 @@ a9c2b4cf4ddceb41694977710188ef94b360901a data/immersiveengineering/recipes/stone 9a9f64ebd9ef61c40969a6f378b1cddf4f6d97f1 data/immersiveengineering/recipes/stonecutting/slab_hempcrete.json ee41289668690dafa9ccfc40918625791b0d58f6 data/immersiveengineering/recipes/stonecutting/slab_hempcrete_brick.json 8060c116f78af288ce2cd8543ca8141730722560 data/immersiveengineering/recipes/stonecutting/slab_slag_brick.json +8215652e10e39489cf58935e9b8bae5c4b72eba6 data/immersiveengineering/recipes/stonecutting/slag_brick.json 32dc92e9e22565b4049e66600f8eaf4aca0aa99e data/immersiveengineering/recipes/stonecutting/stairs_clinker_brick.json 35af644926d183202915cb6453e28244668ed343 data/immersiveengineering/recipes/stonecutting/stairs_concrete.json 3297ae9a1aaa1286c96e6fccf6bdb8939c6fe1ea data/immersiveengineering/recipes/stonecutting/stairs_concrete_brick.json diff --git a/src/generated/resources/data/immersiveengineering/advancements/recipes/misc/stonecutting/slag_brick.json b/src/generated/resources/data/immersiveengineering/advancements/recipes/misc/stonecutting/slag_brick.json new file mode 100644 index 0000000000..a501f8b98a --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/advancements/recipes/misc/stonecutting/slag_brick.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_slag": { + "conditions": { + "items": [ + { + "items": [ + "immersiveengineering:slag" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "immersiveengineering:stonecutting/slag_brick" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_slag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "immersiveengineering:stonecutting/slag_brick" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/recipes/stonecutting/slag_brick.json b/src/generated/resources/data/immersiveengineering/recipes/stonecutting/slag_brick.json new file mode 100644 index 0000000000..ed51affd42 --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/recipes/stonecutting/slag_brick.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "immersiveengineering:slag" + }, + "result": "immersiveengineering:slag_brick" +} \ No newline at end of file diff --git a/src/main/resources/assets/immersiveengineering/manual/autoload.json b/src/main/resources/assets/immersiveengineering/manual/autoload.json index 16dff8b5dd..f182df6488 100644 --- a/src/main/resources/assets/immersiveengineering/manual/autoload.json +++ b/src/main/resources/assets/immersiveengineering/manual/autoload.json @@ -41,6 +41,7 @@ "metalconstruction", "metal_barrel", "concrete", + "clinker_brick", "lighting", "multiblocks", "silo", diff --git a/src/main/resources/assets/immersiveengineering/manual/clinker_brick.json b/src/main/resources/assets/immersiveengineering/manual/clinker_brick.json new file mode 100644 index 0000000000..1cad66c3ab --- /dev/null +++ b/src/main/resources/assets/immersiveengineering/manual/clinker_brick.json @@ -0,0 +1,51 @@ +{ + "smoker_recipe": { + "type": "crafting", + "recipes": [ + [ + [ + { + "x": 24, + "y": 0, + "item": "minecraft:bricks" + }, + { + "x": 42, + "y": 0, + "item": "minecraft:smoker" + }, + { + "x": 78, + "y": 0, + "item": "immersiveengineering:clinker_brick" + } + ] + ] + ] + }, + "variants": { + "type": "crafting", + "recipes": [ + { + "recipe": "crafting/clinker_brick_quoin" + }, + { + "recipe": "crafting/clinker_brick_sill" + } + ] + }, + "cut_variants": { + "type": "item_display", + "items": [ + { + "item": "immersiveengineering:stairs_clinker_brick" + }, + { + "item": "immersiveengineering:wall_clinker_brick" + }, + { + "item": "immersiveengineering:slab_clinker_brick" + } + ] + } +} diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/clinker_brick.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/clinker_brick.txt new file mode 100644 index 0000000000..f380b8c46c --- /dev/null +++ b/src/main/resources/assets/immersiveengineering/manual/en_us/clinker_brick.txt @@ -0,0 +1,12 @@ +Clinker Bricks +Glass Houses and Stones +<&smoker_recipe> +The art of baking bricks has progressed past wasting several parts of the batch producing clinker for being too close to the fire. + +Those looking to recreate the iconic look of clinker brick facades may, however, heat bricks in the §2Smoker§r to vitrify and char the external bricks, turning them into §2Clinker Bricks§r. +<&variants> +To complement the look of facades made from them, clinker bricks can be combined with terracotta to produce several decorative variants for facades: §2Clinker Brick Quoins§r and §2Sills§r. +<&cut_variants> +Clinker Bricks can also be formed into stairs, slabs, and walls. + +§2Clinker Brick Walls§r have a small sill of baked brick on the top-most layer. \ No newline at end of file diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/concrete.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/concrete.txt index c6b5aaf217..70abadd76d 100644 --- a/src/main/resources/assets/immersiveengineering/manual/en_us/concrete.txt +++ b/src/main/resources/assets/immersiveengineering/manual/en_us/concrete.txt @@ -2,8 +2,10 @@ Concrete Fortress Material <&recipe>Concrete is a very hard and resistant composite material. It's cheap to craft and makes for an excellent use for the excess produced by making steel. <&brick>Concrete can be cut and assembled into various bricks and pillars using the §2Stonecutter§r. + Concrete bricks have the same blast resistance as concrete, but can be disassembled faster than their solid counterpart, making them a good structural material. <&partial>Concrete can be cut into slabs of varying thickness using a §2Stonecutter§r. + You can also use that machine to make slabs and stairs of concrete, as well as concrete tiles which are smoother and more polished. <&leaded>Leaded concrete is a reinforced material, which is highly resistant to explosions. It may also afford protection against radiation, if that is something you worry about. <&liquid>Liquid concrete can be produced in a by combining half a bucket of Water with §2Gravel§r, §2Clay§r and §2two pieces of Sand§r. When emptied onto the ground it will spread like water, before solidifying after some time. diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/slag.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/slag.txt index 23e4d0afe0..7dd7ec95ed 100644 --- a/src/main/resources/assets/immersiveengineering/manual/en_us/slag.txt +++ b/src/main/resources/assets/immersiveengineering/manual/en_us/slag.txt @@ -1,9 +1,12 @@ Slag Recycling Zero Waste! -<&slag_gravel>While slag is considered a waste product from the , its mineral composition allows it to be reused in various ways! -§2Slag gravel§r is slag that has been processed in the to a rough grit. It shares its behavior with any other gravel, and can be crushed further into sand. +While slag is considered a waste product from the , its properties allow it to be reused in several ways. Specialty uses are detailed on the following pages. + +Slag can be made into various building blocks, including two thirds of a , and glass. Additionally, due to its mineral composition, slag can be used to create +<&slag_gravel>§2Slag Gravel§r is slag that has been processed in the to a rough grit. It shares its behavior with any other gravel, and can be crushed further into sand. + Additionally, slag gravel contains valuable nutrients for aquatic flora. Any water plants planted on in (such as kelp) tend to grow faster than when grown on other blocks. -
<&slag_glass>By melting slag in a normal furnace rather than crushing it, it becomes §2slag glass§r, a hard, semi-transparent material. It reduces the strength of light passing through it and can be used as an insulator in . -Due to its nutritional properties, slag also makes for an ingredient in . -
Lastly, with the ability to crush it into gravel and sand, slag makes up two thirds of a , making it very useful for large construction efforts. +<&slag_glass>By melting slag in a normal furnace rather than crushing it, it becomes §2slag glass§r, a hard, semi-transparent material. It reduces the strength of light passing through it and can be used as an insulator in . +<&slag_bricks>§2Slag Bricks§r are slag shaped through crafting or stonecutting into glassy bricks. Due to their vitrified construction, slag bricks have a higher density and toughness than normal clay bricks, withstanding explosions more readily. +Slag Bricks can be formed into stairs, slabs, and walls, which have a small sill of baked brick on the top-most layer. \ No newline at end of file diff --git a/src/main/resources/assets/immersiveengineering/manual/slag.json b/src/main/resources/assets/immersiveengineering/manual/slag.json index b407ae8e28..0ad6e06a97 100644 --- a/src/main/resources/assets/immersiveengineering/manual/slag.json +++ b/src/main/resources/assets/immersiveengineering/manual/slag.json @@ -14,5 +14,22 @@ "item": "immersiveengineering:slag_glass" } ] + }, + "slag_bricks": { + "type": "item_display", + "items": [ + { + "item": "immersiveengineering:slag_brick" + }, + { + "item": "immersiveengineering:stairs_slag_brick" + }, + { + "item": "immersiveengineering:wall_slag_brick" + }, + { + "item": "immersiveengineering:slab_slag_brick" + } + ] } }