From e08e508f00fd617e9cefe1476940ec91cc8efe26 Mon Sep 17 00:00:00 2001 From: stfwi Date: Tue, 9 Apr 2019 22:10:02 +0200 Subject: [PATCH] Fixed typo in en-en. Window rendering using multi-layer. Creative tab symbol changed to mod logo. Alternative recipes for crafting table and furnace if IE is not installed. IE concrete texture missing log bail fixed. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 3 +- 1.12/readme.md | 7 + .../engineersdecor/ModEngineersDecor.java | 2 +- .../blocks/BlockDecorWindow.java | 5 + .../wile/engineersdecor/blocks/ModBlocks.java | 10 +- .../wile/engineersdecor/detail/ModConfig.java | 1 + .../detail/RecipeCondModSpecific.java | 11 +- .../blockstates/concrete_wall.json | 4 +- .../blockstates/sign_decor.json | 9 + .../blockstates/steel_framed_window.json | 14 +- .../blockstates/treated_wood_window.json | 12 +- .../assets/engineersdecor/lang/en_us.lang | 5 +- .../assets/engineersdecor/lang/ru_ru.lang | 3 + .../framed_window_glasspane_submodel.json | 17 ++ .../furniture/steel_framed_window_model.json | 125 -------- .../steel_framed_window_submodel.json | 67 ++++ .../furniture/treated_wood_window_model.json | 285 ------------------ .../treated_wood_window_submodel.json | 54 ++++ .../models/block/sign/sign_decor_model.json | 36 +++ .../engineersdecor/recipes/_constants.json | 225 ++++---------- .../rebar_concrete_recipe_standalone.json | 29 ++ .../small_lab_furnace_recipe_standalone.json | 33 ++ ...wood_crafting_table_recipe_standalone.json | 32 ++ .../blocks/iestyle/ironsheet_roof.png | Bin 415 -> 0 bytes .../blocks/iestyle/ironsheet_roof_top.png | Bin 509 -> 0 bytes ...tone_decoration_concrete_by_blusunrize.png | Bin 0 -> 1104 bytes .../blocks/sign/engineersdecor-logo.png | Bin 0 -> 5496 bytes 1.13/readme.md | 2 + credits.md | 10 +- meta/update.json | 3 +- 31 files changed, 411 insertions(+), 595 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json delete mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json delete mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json delete mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof.png delete mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof_top.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/stone_decoration_concrete_by_blusunrize.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/engineersdecor-logo.png diff --git a/1.12/gradle.properties b/1.12/gradle.properties index c72f4b8..204940b 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.3-b4 +version_engineersdecor=1.0.3-b5 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 3a236fa..f34c068 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.3-b5": "[F] Fixed typo in en-en lang file.\n[F] Fixed IE concrete texture missing bailout in log if IE is not installed.\n[F] Using forge multi-layer models for windows to circumvent glitches.\n[M] Changed creative tab logo to the mod logo.\n[A] Added alternative recipes for crafting table and furnace if main IE ingredients are missing (for \"stand-alone\" mod usage).", "1.0.3-b4": "[A] Lab furnace supports electrical speedup when a IE external is placed in one of the two auxiliary slots.\n[F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE).\n[M] Updated ru_ru lang file (Yaroslavik).", "1.0.3-b3": "[A] Added sitting on treated wood stool, Zombies included.\n[A] Added steel framed window.\n[A] Added treated wood pole support head/foot and heavy duty support.\n[A] Added language Russian language support, thanks to yaroslav4167.\n[A] Added config for furnace smelting speed (percent of vanilla furnace).\n[A] Added config for furnace fuel efficiency (in percent, ref is vanilla).\n[F] Treated pole model changed to circumvent potential texture bleeding.\n[M] Treated wood table bounding box aligned with the legs.\n[M] Treated wood crafting table bounding box aligned with the legs.\n[M] Treated wood window can be vertically placed for rooflights.\n[M] Treated wood window can be vertically placed for rooflights.", "1.0.3-b2": "[A] Added config options for selective feature opt-outs (soft opt-out).\n[A] Added config skip registration of opt-out features (hard opt-out).\n[A] Added config to disable all internal recipes (for packs).\n[A] Added JEI API adapter for soft opt-outs.\n[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.", @@ -22,6 +23,6 @@ }, "promos": { "1.12.2-recommended": "1.0.2", - "1.12.2-latest": "1.0.3-b4" + "1.12.2-latest": "1.0.3-b5" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index d1d9874..aec7d8b 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,13 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - 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-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). diff --git a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java index b515a1b..052d6ef 100644 --- a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java @@ -138,7 +138,7 @@ public class ModEngineersDecor @Override @SideOnly(Side.CLIENT) public @Nonnull ItemStack createIcon() - { return new ItemStack(ModBlocks.TREATED_WOOD_LADDER); } + { return new ItemStack(ModBlocks.SIGN_MODLOGO); } }); //-------------------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java index 44df0be..74f31f5 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java @@ -32,6 +32,11 @@ public class BlockDecorWindow extends BlockDecorDirected public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } + @Override + @SideOnly(Side.CLIENT) + public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) + { return (layer==BlockRenderLayer.CUTOUT) || (layer==BlockRenderLayer.TRANSLUCENT); } + @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) 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 24d1506..cc64623 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -134,6 +134,13 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(1,0,1, 15,15,16.0) ); + public static final BlockDecorDirected SIGN_MODLOGO = new BlockDecorDirected( + "sign_decor", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1< 0)) { + int num_missing = 0; for(JsonElement e: missing) { if(!e.isJsonPrimitive()) continue; final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString()); - // At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item. - // --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there - // is no slag. - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return exclude(); + if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) ++num_missing; } - return exclude(); // all required there, but there is no item missing, so another recipe + // At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item. + // --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there + // is no slag. + return (num_missing == 0) ? (exclude()) : (RECIPE_INCLUDE); } else { return RECIPE_INCLUDE; // no missing given, means include if result and required are all there. } diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json index 7956471..6801e12 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json @@ -3,8 +3,8 @@ "defaults": { "model": "engineersdecor:wall/concrete_wall_default", "textures": { - "wall": "immersiveengineering:blocks/stone_decoration_concrete", - "particle": "immersiveengineering:blocks/stone_decoration_concrete" + "wall": "engineersdecor:blocks/iestyle/stone_decoration_concrete_by_blusunrize", + "particle": "engineersdecor:blocks/iestyle/stone_decoration_concrete_by_blusunrize" } }, "variants": { diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json new file mode 100644 index 0000000..f555db6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:sign/sign_decor_model" }, + "variants": { + "normal": [{}], + "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} }, + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json index 186b07c..f8d2f86 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json @@ -1,11 +1,19 @@ { "forge_marker": 1, "defaults": { - "model": "engineersdecor:furniture/steel_framed_window_model" - }, + "model": "forge:multi-layer", + "transform": "forge:default-block", + "custom": { + "base": "engineersdecor:steel_framed_window#frame", + "Cutout": "engineersdecor:steel_framed_window#frame", + "Translucent": "engineersdecor:steel_framed_window#pane" + } +}, "variants": { "normal": [{}], + "inventory": [{}], "facing": { "north": {"y":0}, "south": {"y":0}, "west": {"y":90}, "east": {"y":90}, "up": {"x":90}, "down": {"x":90} }, - "inventory": [{}] + "frame": [ {"model":"engineersdecor:furniture/steel_framed_window_submodel" }], + "pane": [ {"model":"engineersdecor:furniture/framed_window_glasspane_submodel" }] } } diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json index 2fa2dc7..9be1120 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json @@ -1,11 +1,19 @@ { "forge_marker": 1, "defaults": { - "model": "engineersdecor:furniture/treated_wood_window_model" + "model": "forge:multi-layer", + "transform": "forge:default-block", + "custom": { + "base": "engineersdecor:treated_wood_window#frame", + "Cutout": "engineersdecor:treated_wood_window#frame", + "Translucent": "engineersdecor:treated_wood_window#pane" + } }, "variants": { "normal": [{}], + "inventory": [{}], "facing": { "north": {"y":0}, "south": {"y":0}, "west": {"y":90}, "east": {"y":90}, "up": {"x":90}, "down": {"x":90} }, - "inventory": [{}] + "frame": [ {"model":"engineersdecor:furniture/treated_wood_window_submodel" }], + "pane": [ {"model":"engineersdecor:furniture/framed_window_glasspane_submodel" }] } } 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 b3b7940..3da8f77 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 @@ -74,12 +74,15 @@ tile.engineersdecor.treated_wood_windowsill.help=§6Simple window decoration. tile.engineersdecor.steel_framed_window.name=Steel framed window tile.engineersdecor.steel_framed_window.help=§6Steel framed tripple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.small_lab_furnace.name=Small laboratry furnace +tile.engineersdecor.small_lab_furnace.name=Small laboratory furnace tile.engineersdecor.small_lab_furnace.help=§6Small metal cased lab kiln.§r Solid fuel consuming, updraught. \ Slightly hotter and better isolated than a cobblestone furnace, therefore more efficient. \ Two auxiliary slots e.g. for storage. Two stack internal hopper fifos for input, output, \ and fuel. Place an external heater into a aux slot and connect power for electrical \ smelting speed boost. #----------------------------------------------------------------------------------------------------------- +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. +#----------------------------------------------------------------------------------------------------------- # 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 41be774..5b301b2 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 @@ -77,5 +77,8 @@ tile.engineersdecor.steel_framed_window.name=Окно со стальной ра tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. #----------------------------------------------------------------------------------------------------------- +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. +#----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json new file mode 100644 index 0000000..2c9d639 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json @@ -0,0 +1,17 @@ +{ + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "glass": "engineersdecor:blocks/glass/window_glass_texture" + }, + "elements": [ + { + "from": [1, 1, 7.5], + "to": [15, 15, 8.5], + "faces": { + "north": {"texture": "#glass"}, + "south": {"texture": "#glass"} + } + } + ] +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json deleted file mode 100644 index fc91c48..0000000 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "parent": "block/cube", - "ambientocclusion": false, - "textures": { - "glass": "engineersdecor:blocks/glass/window_glass_texture", - "frame": "engineersdecor:blocks/iestyle/steel_texture", - "particle": "engineersdecor:blocks/iestyle/steel_texture" - }, - "elements": [ - { - "from": [1, 1, 7.5], - "to": [15, 15, 8.5], - "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#glass"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#glass"} - } - }, - { - "from": [1, 0, 7.5], - "to": [15, 1, 8.5], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 1, 7.5], - "to": [1, 15, 8.5], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 7.5], - "to": [1, 1, 8.5], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "down": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 7.5], - "to": [1, 16, 8.5], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [1, 15, 7.5], - "to": [15, 16, 8.5], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 1, 7.5], - "to": [16, 15, 8.5], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 7.5], - "to": [16, 16, 8.5], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 0, 7.5], - "to": [16, 1, 8.5], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, - { - "name": "group", - "children": [] - }, - { - "name": "group2", - "children": [1, 2, 3, 4, 5, 6, 7, 8] - }, - { - "name": "group3", - "children": [] - } - ] -} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json new file mode 100644 index 0000000..96a9cc4 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json @@ -0,0 +1,67 @@ +{ + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "frame": "engineersdecor:blocks/iestyle/steel_texture", + "particle": "engineersdecor:blocks/iestyle/steel_texture" + }, + "elements": [ + { + "from": [1, 0, 7.5], + "to": [15, 1, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [0, 0, 7.5], + "to": [1, 16, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [1, 15, 7.5], + "to": [15, 16, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [15, 0, 7.5], + "to": [16, 16, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.9, 0.9, 0.9], + "translation": [ 3, -8, -3] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json deleted file mode 100644 index 0fd6159..0000000 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json +++ /dev/null @@ -1,285 +0,0 @@ -{ - "parent": "block/cube", - "ambientocclusion": false, - "textures": { - "glass": "engineersdecor:blocks/glass/window_glass_texture", - "frame": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", - "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" - }, - "elements": [ - { - "from": [1, 1, 7.5], - "to": [15, 15, 8.5], - "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#glass"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#glass"} - } - }, - { - "from": [1, 0, 8.5], - "to": [15, 1, 9.25], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"}, - "down": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"} - } - }, - { - "from": [0, 1, 8.5], - "to": [1, 15, 9.25], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 8.5], - "to": [1, 1, 9.25], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [8.5, 15, 9.25, 16], "texture": "#frame"}, - "down": {"uv": [0, 6.75, 1, 7.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 8.5], - "to": [1, 16, 9.25], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [8.5, 0, 9.25, 1], "texture": "#frame"}, - "up": {"uv": [0, 8.5, 1, 9.25], "texture": "#frame"} - } - }, - { - "from": [1, 15, 8.5], - "to": [15, 16, 9.25], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"}, - "down": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"} - } - }, - { - "from": [15, 1, 8.5], - "to": [16, 15, 9.25], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 8.5], - "to": [16, 16, 9.25], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [6.75, 0, 7.5, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 8.5, 16, 9.25], "texture": "#frame"} - } - }, - { - "from": [15, 0, 8.5], - "to": [16, 1, 9.25], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [6.75, 15, 7.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 6.75, 16, 7.5], "texture": "#frame"} - } - }, - { - "from": [1, 0, 7.5], - "to": [15, 1, 8.5], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 1, 7.5], - "to": [1, 15, 8.5], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 7.5], - "to": [1, 1, 8.5], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "down": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 7.5], - "to": [1, 16, 8.5], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [1, 15, 7.5], - "to": [15, 16, 8.5], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 1, 7.5], - "to": [16, 15, 8.5], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 7.5], - "to": [16, 16, 8.5], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 0, 7.5], - "to": [16, 1, 8.5], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - }, - { - "from": [1, 0, 6.75], - "to": [15, 1, 7.5], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"}, - "down": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"} - } - }, - { - "from": [0, 1, 6.75], - "to": [1, 15, 7.5], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 6.75], - "to": [1, 1, 7.5], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [6.75, 15, 7.5, 16], "texture": "#frame"}, - "down": {"uv": [0, 8.5, 1, 9.25], "texture": "#frame"} - } - }, - { - "from": [0, 15, 6.75], - "to": [1, 16, 7.5], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [6.75, 0, 7.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 6.75, 1, 7.5], "texture": "#frame"} - } - }, - { - "from": [1, 15, 6.75], - "to": [15, 16, 7.5], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"}, - "down": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"} - } - }, - { - "from": [15, 1, 6.75], - "to": [16, 15, 7.5], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 6.75], - "to": [16, 16, 7.5], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [8.5, 0, 9.25, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 6.75, 16, 7.5], "texture": "#frame"} - } - }, - { - "from": [15, 0, 6.75], - "to": [16, 1, 7.5], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [8.5, 15, 9.25, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 8.5, 16, 9.25], "texture": "#frame"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, - { - "name": "group", - "children": [1, 2, 3, 4, 5, 6, 7, 8] - }, - { - "name": "group2", - "children": [9, 10, 11, 12, 13, 14, 15, 16] - }, - { - "name": "group3", - "children": [17, 18, 19, 20, 21, 22, 23, 24] - } - ] -} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json new file mode 100644 index 0000000..e591e0e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json @@ -0,0 +1,54 @@ +{ + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "frame": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", + "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" + }, + "elements": [ + { + "from": [1, 0, 6.5], + "to": [15, 1, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [0, 0, 6.5], + "to": [1, 16, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [1, 15, 6.5], + "to": [15, 16, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [15, 0, 6.5], + "to": [16, 16, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + } + ] +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json new file mode 100644 index 0000000..e632e1e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json @@ -0,0 +1,36 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", + "f": "engineersdecor:blocks/sign/engineersdecor-logo", + "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 0.5], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#f"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + } + ], + "display": { + "ground": { + "translation": [0, 0, 7], + "scale": [0.7, 0.7, 0.7] + }, + "gui": { + "rotation": [0, 0, 0], + "translation": [0, 0.5, 0] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -7.3] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json index b1352f9..12f9f28 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -1,249 +1,138 @@ [ { - "ingredient": { - "type": "forge:ore_dict", - "ore": "itemSlag" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "itemSlag" }, "name": "itemSlag" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plankTreatedWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plankTreatedWood" }, "name": "plankTreatedWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabTreatedWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabTreatedWood" }, "name": "slabTreatedWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickTreatedWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickTreatedWood" }, "name": "stickTreatedWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plateIron" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "ingotIron" }, + "name": "ingotIron" + }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "plateIron" }, "name": "plateIron" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plateSteel" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plateSteel" }, "name": "plateSteel" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plateAluminium" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plateAluminium" }, "name": "plateAluminium" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickSteel" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickSteel" }, "name": "stickSteel" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickIron" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickIron" }, "name": "stickIron" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickAluminium" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickAluminium" }, "name": "stickAluminium" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plankWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plankWood" }, "name": "plankWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickWood" }, "name": "stickWood" }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabSheetmetalIron" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalIron" }, "name": "slabSheetmetalIron" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabSheetmetalSteel" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalSteel" }, "name": "slabSheetmetalSteel" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabSheetmetalAluminium" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminium" }, "name": "slabSheetmetalAluminium" }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "sand" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "sand" }, "name": "sand" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "sandstone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "sandstone" }, "name": "sandstone" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "bricksStone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "bricksStone" }, "name": "bricksStone" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotBrick" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "ingotBrick" }, "name": "ingotBrick" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotBrickNether" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "ingotBrickNether" }, "name": "ingotBrickNether" }, - { "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "plateIron" - }, - { - "type": "forge:ore_dict", - "ore": "plateSteel" - }, - { - "type": "forge:ore_dict", - "ore": "plateCopper" - }, - { - "type": "forge:ore_dict", - "ore": "plateAluminium" - }, - { - "type": "forge:ore_dict", - "ore": "plateNickel" - }, - { - "type": "forge:ore_dict", - "ore": "plateLead" - } + { "type": "forge:ore_dict", "ore": "plateIron" }, + { "type": "forge:ore_dict", "ore": "plateSteel" }, + { "type": "forge:ore_dict", "ore": "plateCopper" }, + { "type": "forge:ore_dict", "ore": "plateAluminium" }, + { "type": "forge:ore_dict", "ore": "plateNickel" }, + { "type": "forge:ore_dict", "ore": "plateLead" } ], "name": "plateAnyMetal" }, - { "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "ingotBrick" - }, - { - "type": "forge:ore_dict", - "ore": "ingotBrickNether" - } + { "type": "forge:ore_dict", "ore": "ingotBrick" }, + { "type": "forge:ore_dict", "ore": "ingotBrickNether" } ], "name": "ingotAnyBrick" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "dustGlowstone" }, "name": "luminescentDust" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "glowstone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "glowstone" }, "name": "luminescentBlock" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "paneGlass" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "paneGlass" }, "name": "paneGlass" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockGlass" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "blockGlass" }, "name": "blockGlass" }, { - "ingredient": { - "item": "minecraft:diamond", - "data": 0 - }, + "ingredient": { "item": "minecraft:diamond", "data": 0 }, "name": "itemDiamond" }, { - "ingredient": { - "item": "minecraft:crafting_table", - "data": 0 - }, + "ingredient": { "item": "minecraft:crafting_table", "data": 0 }, "name": "itemCraftingTable" }, { - "ingredient": { - "item": "minecraft:hopper", - "data": 0 - }, + "ingredient": { "item": "minecraft:hopper", "data": 0 }, "name": "anyHopper" }, { "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "stickIron" - }, - { - "type": "forge:ore_dict", - "ore": "stickSteel" - } + { "type": "forge:ore_dict", "ore": "stickIron" }, + { "type": "forge:ore_dict", "ore": "stickSteel" } ], "name": "stickFerroMetal" }, @@ -251,27 +140,35 @@ "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:stone_decoration" } ], - "ingredient": { - "item": "immersiveengineering:stone_decoration", - "data": 5 - }, + "ingredient": { "item": "immersiveengineering:stone_decoration", "data": 5 }, "name": "blockConcreteIe" }, { "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:wooden_device0" } ], - "ingredient": { - "item": "immersiveengineering:wooden_device0", - "data": 0 - }, + "ingredient": { "item": "immersiveengineering:wooden_device0", "data": 0 }, "name": "crateTreatedWood" }, { - "ingredient": { - "item": "minecraft:furnace", - "data": 0 - }, + "conditions": [ + { "type": "engineersdecor:grc", "missing": ["immersiveengineering:stone_decoration"] } + ], + "ingredient": [ + { "item": "minecraft:concrete", "data": 32767 }, + { "item": "minecraft:concrete_powder", "data": 32767 } + ], + "name": "blockConcreteMc" + }, + { + "ingredient": [ + { "item": "minecraft:chest" }, + { "type": "forge:ore_dict", "ore": "chestWood" } + ], + "name": "itemAnyChest" + }, + { + "ingredient": { "item": "minecraft:furnace", "data": 0 }, "name": "itemFurnace" } ] \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json new file mode 100644 index 0000000..e549f2e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:rebar_concrete", + "missing": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SCS", + "CSC", + "SCS" + ], + "key": { + "C": { + "item": "#blockConcreteMc", + "data": 0 + }, + "S": { + "item": "#ingotIron", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:rebar_concrete", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json new file mode 100644 index 0000000..a488383 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json @@ -0,0 +1,33 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:small_lab_furnace", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "HPP", + "PFP", + "PPP" + ], + "key": { + "F": { + "item": "#itemFurnace", + "data": 0 + }, + "P": { + "item": "#ingotIron", + "data": 0 + }, + "H": { + "item": "#anyHopper", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:small_lab_furnace", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json new file mode 100644 index 0000000..6d47d69 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json @@ -0,0 +1,32 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_crafting_table", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "PP", + "SC" + ], + "key": { + "P": { + "item": "#plankWood", + "data": 0 + }, + "C": { + "item": "#itemCraftingTable", + "data": 0 + }, + "S": { + "item": "#itemAnyChest", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_crafting_table", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof.png deleted file mode 100644 index 23dff87467dd928f1f9f79ada28aa073fd4d3e63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@#P)pGQAtEWR4C6)Qn9YWKn%;}0_uPmDN=!|z_0RI3>^_jOh_#J2ReMY zH@Ms*Q(HTZ<0hO=r@rsE+pVfTpUzE>-E~U?RvciaJgJot5w^!@Aq3()!p6Q z%t8pNDk37Hs`Yg?o0%B^cc0+<{jREn&*w9MoO3B<97p-q?RGOWrPweGWV`z?43)(1 zv~WBgMP!<=TrN4$-8Y*J?S&9_yPdm}vsf$uOscF>3Nd%*KmaMFoHLhHZf0gp)1;ID zlu}4lRr?lQ0RUj^77;TO5hnAS71@=bb=N9Z*|jIeSWychRE+Y}tDW4Zx|+lQ)GY!0 zCLtm@XJ!b%m<-val$>))Nkl%M4?BNrKA&4PO0gJY(=<%)*Xn-;^!<1|Dm;!OGgZ}k z8mjtwy+mXJ4u=DWlu~#Otl#Ip@Bfdl7EhxFwcqdg2V#sQ`~mXs-IB-WO=$oC002ov JPDHLkV1nvRwIu)m diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof_top.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof_top.png deleted file mode 100644 index a5f038273c5b831a6f28a2bc0fe1dc8280a98e51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 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