From 8dcc80db56ca6bb923acfbc87d170f830c4c94df Mon Sep 17 00:00:00 2001 From: Voxelo <41349408+Voxelo@users.noreply.github.com> Date: Wed, 5 Jun 2019 12:52:45 -0400 Subject: [PATCH 1/5] 1.13 Lang File fixes (#28) Lang file en_us capitalization fixes (Voxelo). --- .../assets/engineersdecor/lang/en_us.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json b/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json index feee385..0d5b675 100644 --- a/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -5,49 +5,49 @@ "itemGroup.tabengineersdecor":"Engineer's Decor", - "engineersdecor.config.title":"Engineer's Decor config", + "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", - "block.engineersdecor.clinker_brick_block":"Clinker brick", + "block.engineersdecor.clinker_brick_block":"Clinker Brick", "block.engineersdecor.clinker_brick_block.help":"§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block.", - "block.engineersdecor.clinker_brick_stairs":"Clinker brick stairs", + "block.engineersdecor.clinker_brick_stairs":"Clinker Brick Stairs", "block.engineersdecor.clinker_brick_stairs.help":"§6Looks slightly darker and more color intensive than the vanilla brick block.", - "block.engineersdecor.slag_brick_block":"Slag brick", + "block.engineersdecor.slag_brick_block":"Slag Brick", "block.engineersdecor.slag_brick_block.help":"§6A gray-brown brick block with position dependent texture variations.", - "block.engineersdecor.slag_brick_stairs":"Slag brick stairs", + "block.engineersdecor.slag_brick_stairs":"Slag Brick Stairs", "block.engineersdecor.slag_brick_stairs.help":"§6Gray-brown brick stairs.", - "block.engineersdecor.rebar_concrete":"Rebar concrete", + "block.engineersdecor.rebar_concrete":"Rebar Concrete", "block.engineersdecor.rebar_concrete.help":"§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.rebar_concrete_stairs":"Rebar concrete stairs", + "block.engineersdecor.rebar_concrete_stairs":"Rebar Concrete Stairs", "block.engineersdecor.rebar_concrete_stairs.help":"§6Steel reinforced concrete stairs.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.rebar_concrete_wall":"Rebar concrete wall", + "block.engineersdecor.rebar_concrete_wall":"Rebar Concrete Wall", "block.engineersdecor.rebar_concrete_wall.help":"§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.concrete_wall":"Concrete wall", + "block.engineersdecor.concrete_wall":"Concrete Wall", "block.engineersdecor.concrete_wall.help":"§6Wall made of solid concrete.", - "block.engineersdecor.metal_rung_ladder":"Metal rung ladder", + "block.engineersdecor.metal_rung_ladder":"Metal Rung Ladder", "block.engineersdecor.metal_rung_ladder.help":"§6Typical industrial wall ladder, consisting of horizontal metal rod rungs.", - "block.engineersdecor.metal_rung_steps":"Staggered metal steps", + "block.engineersdecor.metal_rung_steps":"Staggered Metal Steps", "block.engineersdecor.metal_rung_steps.help":"§6Staggered rod rungs affixed to a wall, allowing to climb up, fall down, and so on.", - "block.engineersdecor.treated_wood_ladder":"Treated wood ladder", + "block.engineersdecor.treated_wood_ladder":"Treated Wood Ladder", "block.engineersdecor.treated_wood_ladder.help":"§6Weather-proof wooden ladder.", - "block.engineersdecor.iron_sheet_roof":"Iron sheet metal roof", + "block.engineersdecor.iron_sheet_roof":"Iron Sheet Metal Roof", "block.engineersdecor.iron_sheet_roof.help":"§6Well, it's a roof.", - "block.engineersdecor.treated_wood_pole":"Straight treated wood pole", + "block.engineersdecor.treated_wood_pole":"Straight Treated Wood Pole", "block.engineersdecor.treated_wood_pole.help":"§6Straight pole fragment with the diameter of a wire relay.§r\nCan be useful as alternative to the wire posts if special special lengths are needed, or as support for structures.", - "block.engineersdecor.treated_wood_table":"Treated wood table", + "block.engineersdecor.treated_wood_table":"Treated Wood Table", "block.engineersdecor.treated_wood_table.help":"§6Robust four-legged wood table." } From ee1c82dee50373b2291da464f4a2fb85c19e5d96 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 5 Jun 2019 10:04:04 -0700 Subject: [PATCH 2/5] Fix typos in 1.12 lang files (#29) en_us lang file typo fixes (Angela). --- .../main/resources/assets/engineersdecor/lang/en_us.lang | 8 ++++---- .../main/resources/assets/engineersdecor/lang/ru_ru.lang | 4 ++-- 2 files changed, 6 insertions(+), 6 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 ae2a0e6..1f2118f 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 @@ -50,7 +50,7 @@ tile.engineersdecor.rebar_concrete_tile_stairs.help=§6Steel reinforced concrete #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_pole.name=Straight Treated Wood Pole tile.engineersdecor.treated_wood_pole.help=§6Straight pole fragment with a diameter of a wire relay.§r\n\ - Can be useful as alternative to the wire posts if special special lengths are needed, \ + Can be useful as alternative to the wire posts if special lengths are needed, \ or as support for structures. tile.engineersdecor.treated_wood_pole_head.name=Straight Treated Wood Pole Head/Foot tile.engineersdecor.treated_wood_pole_head.help=§6Wooden part fitting as foot or head of straight poles. @@ -81,11 +81,11 @@ tile.engineersdecor.iron_inset_light.help=§6Small glowstone light source, sunk Useful to light up places where electrical light installations are problematic.\ Light level like a torch. tile.engineersdecor.treated_wood_window.name=Treated Wood Window -tile.engineersdecor.treated_wood_window.help=§6Wood framed tripple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes. +tile.engineersdecor.treated_wood_window.help=§6Wood framed triple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes. tile.engineersdecor.treated_wood_windowsill.name=Treated Wood Window Sill 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.steel_framed_window.help=§6Steel framed triple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes. #----------------------------------------------------------------------------------------------------------- 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. \ @@ -124,7 +124,7 @@ tile.engineersdecor.passive_fluid_accumulator.help=§6Vacuum suction based fluid 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 \ - solts with logical AND or OR can be used as internal trigger source. Internal trigger can be \ + 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. 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 6b4eca9..6a29f7a 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 @@ -82,7 +82,7 @@ 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 tripple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes. +#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.small_lab_furnace.name=Компактная лабораторная печь tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. @@ -117,7 +117,7 @@ tile.engineersdecor.passive_fluid_accumulator.name=Passive fluid accumulator 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 \ - solts with logical AND or OR can be used as internal trigger source. Internal trigger can be \ + 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. From 291debfde1b20b226e87e1886177b809f7fef614 Mon Sep 17 00:00:00 2001 From: stfwi Date: Wed, 5 Jun 2019 19:41:40 +0200 Subject: [PATCH 3/5] Factory area sign added. Electrical furnace recipe changed. Config extended. Experimental micro slabs added. Experimental stained clinker added. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 3 +- 1.12/readme.md | 5 + .../engineersdecor/blocks/BlockDecor.java | 3 + .../blocks/BlockDecorHalfSlab.java | 202 ++++++++++++++++++ .../wile/engineersdecor/blocks/ModBlocks.java | 95 ++++++-- .../wile/engineersdecor/detail/ModConfig.java | 12 ++ .../clinker_brick_stained_block.json | 20 ++ .../clinker_brick_stained_stairs.json | 56 +++++ .../blockstates/halfslab_concrete.json | 28 +++ .../blockstates/halfslab_rebar_concrete.json | 28 +++ .../halfslab_sheetmetal_aluminum.json | 28 +++ .../halfslab_sheetmetal_copper.json | 28 +++ .../blockstates/halfslab_sheetmetal_gold.json | 28 +++ .../blockstates/halfslab_sheetmetal_iron.json | 28 +++ .../halfslab_sheetmetal_steel.json | 28 +++ .../blockstates/halfslab_treated_wood.json | 28 +++ .../blockstates/sign_factoryarea.json | 9 + .../assets/engineersdecor/lang/en_us.lang | 24 ++- .../assets/engineersdecor/lang/ru_ru.lang | 24 ++- .../block/sign/sign_factoryarea_model.json | 4 + .../block/sign/sign_rect14x14_model.json | 35 +++ .../models/block/slab/halfslab_s0_model.json | 48 +++++ .../models/block/slab/halfslab_s1_model.json | 21 ++ .../models/block/slab/halfslab_s2_model.json | 21 ++ .../models/block/slab/halfslab_s3_model.json | 21 ++ .../models/block/slab/halfslab_s4_model.json | 21 ++ .../models/block/slab/halfslab_s5_model.json | 21 ++ .../models/block/slab/halfslab_s6_model.json | 21 ++ .../models/block/slab/halfslab_s7_model.json | 21 ++ .../models/block/slab/halfslab_s8_model.json | 21 ++ .../models/block/slab/halfslab_s9_model.json | 21 ++ .../models/block/slab/halfslab_sa_model.json | 21 ++ .../models/block/slab/halfslab_sb_model.json | 21 ++ .../models/block/slab/halfslab_sc_model.json | 21 ++ .../models/block/slab/halfslab_sd_model.json | 21 ++ .../models/block/slab/halfslab_se_model.json | 21 ++ .../engineersdecor/recipes/_constants.json | 30 +++ .../clinker_brick_stained_block_recipe.json | 17 ++ .../clinker_brick_stained_stairs_recipe.json | 24 +++ ...brick_stained_stairs_recipe_decompose.json | 23 ++ .../recipes/sign_factoryarea_recipe.json | 16 ++ .../sign_hotwire_recipe_backcycle.json | 4 +- .../small_electrical_furnace_recipe.json | 23 +- ..._electrical_furnace_recipe_standalone.json | 3 +- .../recipes/straight_pipe_valve_recipe.json | 2 +- .../clinker_brick_stained_texture0.png | Bin 0 -> 764 bytes .../clinker_brick_stained_texture1.png | Bin 0 -> 743 bytes .../clinker_brick_stained_texture2.png | Bin 0 -> 749 bytes .../clinker_brick_stained_texture3.png | Bin 0 -> 746 bytes .../clinker_brick_stained_texture4.png | Bin 0 -> 746 bytes .../clinker_brick_stained_texture5.png | Bin 0 -> 756 bytes .../clinker_brick_stained_texture6.png | Bin 0 -> 758 bytes .../clinker_brick_stained_texture7.png | Bin 0 -> 743 bytes .../blocks/sign/sign_factoryarea_texture.png | Bin 0 -> 1581 bytes 1.13/readme.md | 4 +- meta/update.json | 5 +- 57 files changed, 1172 insertions(+), 39 deletions(-) create mode 100644 1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_block.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_stairs.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_concrete.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_rebar_concrete.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_aluminum.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_copper.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_gold.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_iron.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_steel.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_treated_wood.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_factoryarea_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s1_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s2_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s3_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s4_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s5_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s6_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s7_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s8_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s9_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sa_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sb_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sc_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sd_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_se_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture6.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_factoryarea_texture.png diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 4ec3dd3..0c49c36 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.7 +version_engineersdecor=1.0.8-b1 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index e72c9da..c320396 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.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).", "1.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.\n[A] Added standalone recipes for signs, factory dropper, and electrical furnace.\n[M] Adapted \"Caution\" sign backgrounds to the yellow defense system warning background.", "1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.", "1.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!", @@ -41,6 +42,6 @@ }, "promos": { "1.12.2-recommended": "1.0.7", - "1.12.2-latest": "1.0.7" + "1.12.2-latest": "1.0.8-b1" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index d51f796..6048e63 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,11 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - 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 [R] Release based on v1.0.7-b2. Release-to-release changes: * Factory dropper added. 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 06575c5..0c0abba 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java @@ -56,6 +56,7 @@ public class BlockDecor extends Block public static final long CFG_ELECTRICAL = 0x0000000000010000L; // Denotes if a component is mainly flux driven. public static final long CFG_REDSTONE_CONTROLLED = 0x0000000000020000L; // Denotes if a component has somehow a redstone control input 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; @@ -70,6 +71,8 @@ public class BlockDecor extends Block setResistance((resistance > 0) ? resistance : 10.0f); setSoundType((sound==null) ? SoundType.STONE : sound); setLightOpacity(0); + // @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); } diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java new file mode 100644 index 0000000..879012e --- /dev/null +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java @@ -0,0 +1,202 @@ +/* + * @file BlockDecorHalfSlab.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Half slab characteristics class. + */ +package wile.engineersdecor.blocks; + +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.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; + + +public class BlockDecorHalfSlab extends BlockDecor +{ + public static final PropertyInteger PARTS = PropertyInteger.create("parts", 0, 14); + + protected static final AxisAlignedBB AABBs[] = { + new AxisAlignedBB(0, 0./16, 0, 1, 2./16, 1), new AxisAlignedBB(0, 0./16, 0, 1, 4./16, 1), + new AxisAlignedBB(0, 0./16, 0, 1, 6./16, 1), new AxisAlignedBB(0, 0./16, 0, 1, 8./16, 1), + new AxisAlignedBB(0, 0./16, 0, 1, 10./16, 1), new AxisAlignedBB(0, 0./16, 0, 1, 12./16, 1), + new AxisAlignedBB(0, 0./16, 0, 1, 14./16, 1), new AxisAlignedBB(0, 0./16, 0, 1, 16./16, 1), + new AxisAlignedBB(0, 2./16, 0, 1, 16./16, 1), new AxisAlignedBB(0, 4./16, 0, 1, 16./16, 1), + new AxisAlignedBB(0, 6./16, 0, 1, 16./16, 1), new AxisAlignedBB(0, 8./16, 0, 1, 16./16, 1), + new AxisAlignedBB(0, 10./16, 0, 1, 16./16, 1), new AxisAlignedBB(0, 12./16, 0, 1, 16./16, 1), + new AxisAlignedBB(0, 14./16, 0, 1, 16./16, 1), new AxisAlignedBB(0,0,0,1,1,1), // <- with 4bit fill + }; + protected static final int num_slabs_contained_in_parts_[] = { + 1,2,3,4,5,6,7,8,7,6,5,4,3,2,1 ,0x1 // <- with 4bit fill + }; + + public BlockDecorHalfSlab(@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) == 0x07; } + + @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,14)); } + + @Override + public int getMetaFromState(IBlockState state) + { return state.getValue(PARTS); } + + @Override + protected BlockStateContainer createBlockState() + { return new BlockStateContainer(this, PARTS); } + + @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) + { + final int parts = state.getValue(PARTS); + switch(face) { + case UP: + if(parts >= 0x07) return BlockFaceShape.SOLID; + break; + case DOWN: + if(parts <= 0x07) return BlockFaceShape.SOLID; + break; + default: + if((parts > 0x05) && (parts < 0x0a)) return BlockFaceShape.SOLID; + } + return BlockFaceShape.UNDEFINED; + } + + @Override + @SuppressWarnings("deprecation") + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { return AABBs[state.getValue(PARTS) & 0xf]; } + + @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) & 0xf])); } + + @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 : 14); } + + @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; + if((facing != EnumFacing.UP) && (facing != EnumFacing.DOWN)) return false; + int parts = state.getValue(PARTS); + if((facing != EnumFacing.UP) && (parts > 7)) { + world.setBlockState(pos, state.withProperty(PARTS, parts-1), 3); + } else if((facing != EnumFacing.DOWN) && (parts < 7)) { + world.setBlockState(pos, state.withProperty(PARTS, parts+1), 3); + } else { + return (parts != 7); + } + if(world.isRemote) return true; + if(!player.isCreative()) { + stack.shrink(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(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) 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) && (parts <= 7)) { + if(parts > 0) { + world.setBlockState(pos, state.withProperty(PARTS, parts-1), 3); + } else { + world.setBlockToAir(pos); + } + } else if((facing == EnumFacing.UP) && (parts >= 7)) { + if(parts < 14) { + world.setBlockState(pos, state.withProperty(PARTS, parts + 1), 3); + } else { + world.setBlockToAir(pos); + } + } else { + return; + } + 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 bef819b..d9a4d01 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -24,8 +24,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.ResourceLocation; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; @@ -44,6 +45,9 @@ public class ModBlocks 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 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 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); @@ -263,6 +267,54 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,15) ); + public static final BlockDecorDirected SIGN_FACTORY_AREA = new BlockDecorDirected( + "sign_factoryarea", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + Material.WOOD, 0.1f, 1f, SoundType.WOOD, + ModAuxiliaries.getPixeledAABB(2,2,15.6, 15,15,16) + ); + + public static final BlockDecorHalfSlab HALFSLAB_REBARCONCRETE = new BlockDecorHalfSlab( + "halfslab_rebar_concrete", + BlockDecor.CFG_CUTOUT, + Material.ROCK, 2f, 2000f, SoundType.STONE + ); + public static final BlockDecorHalfSlab HALFSLAB_CONCRETE = new BlockDecorHalfSlab( + "halfslab_concrete", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.ROCK, 0.4f, 10f, SoundType.STONE + ); + public static final BlockDecorHalfSlab HALFSLAB_TREATEDWOOD = new BlockDecorHalfSlab( + "halfslab_treated_wood", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.WOOD, 0.4f, 4f, SoundType.WOOD + ); + public static final BlockDecorHalfSlab HALFSLAB_SHEETMETALIRON = new BlockDecorHalfSlab( + "halfslab_sheetmetal_iron", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.IRON, 0.4f, 10f, SoundType.METAL + ); + public static final BlockDecorHalfSlab HALFSLAB_SHEETMETALSTEEL = new BlockDecorHalfSlab( + "halfslab_sheetmetal_steel", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.IRON, 0.4f, 10f, SoundType.METAL + ); + public static final BlockDecorHalfSlab HALFSLAB_SHEETMETALCOPPER = new BlockDecorHalfSlab( + "halfslab_sheetmetal_copper", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.IRON, 0.4f, 10f, SoundType.METAL + ); + public static final BlockDecorHalfSlab HALFSLAB_SHEETMETALGOLD = new BlockDecorHalfSlab( + "halfslab_sheetmetal_gold", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.IRON, 0.4f, 10f, SoundType.METAL + ); + public static final BlockDecorHalfSlab HALFSLAB_SHEETMETALALUMINIUM = new BlockDecorHalfSlab( + "halfslab_sheetmetal_aluminum", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HARD_IE_DEPENDENT, + Material.IRON, 0.4f, 10f, SoundType.METAL + ); + //-------------------------------------------------------------------------------------------------------------------- //-- Tile entities //-------------------------------------------------------------------------------------------------------------------- @@ -322,29 +374,39 @@ public class ModBlocks TREATED_WOOD_TABLE, TREATED_WOOD_STOOL, TREATED_WOOD_WINDOW, + STEEL_FRAMED_WINDOW, TREATED_WOOD_WINDOWSILL, INSET_LIGHT_IRON, - SMALL_LAB_FURNACE, SMALL_LAB_FURNACE_TEI, - STEEL_FRAMED_WINDOW, TREATED_WOOD_POLE_SUPPORT, TREATED_WOOD_POLE_HEAD, - SIGN_MODLOGO, THIN_STEEL_POLE, THICK_STEEL_POLE, THIN_STEEL_POLE_HEAD, THICK_STEEL_POLE_HEAD, STEEL_DOUBLE_T_SUPPORT, + SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_MODLOGO, + SMALL_LAB_FURNACE, SMALL_LAB_FURNACE_TEI, + SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI, + FACTORY_DROPPER, FACTORY_DROPPER_TEI, + SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI, STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI, PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI, - SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI, - SIGN_HOTWIRE, SIGN_DANGER, - SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI, - SIGN_DEFENSE, - FACTORY_DROPPER, FACTORY_DROPPER_TEI }; private static final Object dev_content[] = { SIGN_MINDSTEP, + // design not sure yet ... + CLINKER_BRICK_STAINED_BLOCK, + CLINKER_BRICK_STAINED_STAIRS, + // handling not sure yet ... + HALFSLAB_REBARCONCRETE, + HALFSLAB_CONCRETE, + HALFSLAB_TREATEDWOOD, + HALFSLAB_SHEETMETALIRON, + HALFSLAB_SHEETMETALSTEEL, + HALFSLAB_SHEETMETALCOPPER, + HALFSLAB_SHEETMETALGOLD, + HALFSLAB_SHEETMETALALUMINIUM, }; //-------------------------------------------------------------------------------------------------------------------- @@ -362,15 +424,22 @@ public class ModBlocks public static final void registerBlocks(RegistryEvent.Register event) { // Config based registry selection + final boolean ie_installed = Loader.isModLoaded("immersiveengineering"); int num_block_registrations_skipped = 0; + int num_block_registrations_skipped_noie = 0; final boolean woor = ModConfig.isWithoutOptOutRegistration(); for(Object e:content) { if(e instanceof Block) { - if((!woor) || (!ModConfig.isOptedOut((Block)e)) || (e==SIGN_MODLOGO)) { - registeredBlocks.add((Block) e); - } else { + if((!ie_installed) && ((e instanceof BlockDecor) && ((((BlockDecor)e).config & BlockDecor.CFG_HARD_IE_DEPENDENT)!=0))) { ++num_block_registrations_skipped; + ++num_block_registrations_skipped_noie; + continue; } + if((woor) && (ModConfig.isOptedOut((Block)e)) && (e!=SIGN_MODLOGO)) { + ++num_block_registrations_skipped; + continue; + } + registeredBlocks.add((Block) e); } else if(e instanceof TileEntityRegistrationData) { registeredTileEntityInits.add((TileEntityRegistrationData)e); } @@ -386,7 +455,7 @@ public class ModBlocks } for(Block e:registeredBlocks) event.getRegistry().register(e); ModEngineersDecor.logger.info("Registered " + Integer.toString(registeredBlocks.size()) + " blocks."); - if(num_block_registrations_skipped > 0) ModEngineersDecor.logger.info("Skipped registration of " + num_block_registrations_skipped + " blocks."); + if(num_block_registrations_skipped > 0) ModEngineersDecor.logger.info("Skipped registration of " + num_block_registrations_skipped + " blocks, " + num_block_registrations_skipped_noie + " because IE is not installed."); for(TileEntityRegistrationData e:registeredTileEntityInits) GameRegistry.registerTileEntity(e.clazz, e.key); ModEngineersDecor.logger.info("Registered " + Integer.toString(registeredTileEntityInits.size()) + " tile entities."); } 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 cb39c5c..1cf5e69 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java @@ -135,6 +135,16 @@ public class ModConfig @Config.Name("Without signs") @Config.RequiresMcRestart public boolean without_sign_plates = false; + + @Config.Comment({"Disable the factory dropper."}) + @Config.Name("Without factory dropper") + @Config.RequiresMcRestart + public boolean without_factory_dropper = false; + + @Config.Comment({"Disable stackable 1/8 block slices."}) + @Config.Name("Without slab slices") + @Config.RequiresMcRestart + public boolean without_halfslabs = false; } @Config.Comment({ @@ -305,6 +315,8 @@ public class ModConfig if(optout.without_electrical_furnace && (block instanceof BlockDecorFurnaceElectrical)) return true; if(optout.without_passive_fluid_accumulator && (block instanceof BlockDecorPassiveFluidAccumulator)) return true; if(optout.without_waste_incinerator && (block instanceof BlockDecorWasteIncinerator)) return true; + if(optout.without_factory_dropper && (block instanceof BlockDecorDropper)) return true; + if(optout.without_halfslabs && (block instanceof BlockDecorHalfSlab)) return true; if(optout.without_windows && rn.endsWith("_window")) return true; if(optout.without_light_sources && rn.endsWith("_light")) return true; if(optout.without_ladders && (block instanceof BlockDecorLadder)) return true; diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_block.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_block.json new file mode 100644 index 0000000..7918bb6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_block.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:std/decor_full_block_model", + "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0" } + }, + "variants": { + "normal": [ + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture1" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture2" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture3" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture4" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture5" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture6" } }, + { "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture7" } } + ], + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_stairs.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_stairs.json new file mode 100644 index 0000000..fdc3ee8 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stained_stairs.json @@ -0,0 +1,56 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:stairs/decor_straight_stairs_model", + "textures": { + "particle": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0", + "bottom": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0", + "top": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0", + "side": "engineersdecor:blocks/clinker_brick/clinker_brick_stained_texture0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model" }, + "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model" }, + "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model" }, + "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model" }, + "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model" }, + "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_concrete.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_concrete.json new file mode 100644 index 0000000..2558fdf --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_concrete.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/stone_decoration_concrete" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_rebar_concrete.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_rebar_concrete.json new file mode 100644 index 0000000..8eb92d3 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_rebar_concrete.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture0" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_aluminum.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_aluminum.json new file mode 100644 index 0000000..81a6e72 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_aluminum.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/sheetmetal_aluminum" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_copper.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_copper.json new file mode 100644 index 0000000..34d8409 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_copper.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/sheetmetal_copper" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_gold.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_gold.json new file mode 100644 index 0000000..6b024f1 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_gold.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/sheetmetal_gold" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_iron.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_iron.json new file mode 100644 index 0000000..cb99562 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_iron.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/sheetmetal_iron" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_steel.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_steel.json new file mode 100644 index 0000000..e1cea07 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_sheetmetal_steel.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/sheetmetal_steel" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_treated_wood.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_treated_wood.json new file mode 100644 index 0000000..5a9069d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/halfslab_treated_wood.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:slab/halfslab_s0_model", + "textures": { "all": "immersiveengineering:blocks/treated_wood" } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "parts": { + "0" : { "model": "engineersdecor:slab/halfslab_s0_model" }, + "1" : { "model": "engineersdecor:slab/halfslab_s1_model" }, + "2" : { "model": "engineersdecor:slab/halfslab_s2_model" }, + "3" : { "model": "engineersdecor:slab/halfslab_s3_model" }, + "4" : { "model": "engineersdecor:slab/halfslab_s4_model" }, + "5" : { "model": "engineersdecor:slab/halfslab_s5_model" }, + "6" : { "model": "engineersdecor:slab/halfslab_s6_model" }, + "7" : { "model": "engineersdecor:slab/halfslab_s7_model" }, + "8" : { "model": "engineersdecor:slab/halfslab_s8_model" }, + "9" : { "model": "engineersdecor:slab/halfslab_s9_model" }, + "10": { "model": "engineersdecor:slab/halfslab_sa_model" }, + "11": { "model": "engineersdecor:slab/halfslab_sb_model" }, + "12": { "model": "engineersdecor:slab/halfslab_sc_model" }, + "13": { "model": "engineersdecor:slab/halfslab_sd_model" }, + "14": { "model": "engineersdecor:slab/halfslab_se_model" } + } + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json new file mode 100644 index 0000000..10e1735 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:sign/sign_factoryarea_model" }, + "variants": { + "normal": [{}], + "inventory": [{}], + "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} } + } +} 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 1f2118f..3142729 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 @@ -14,6 +14,8 @@ engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Help§6]§r #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.clinker_brick_block.name=Clinker Brick Block tile.engineersdecor.clinker_brick_block.help=§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block. +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.slag_brick_block.name=Slag Brick Block tile.engineersdecor.slag_brick_block.help=§6A gray-brown brick block with position dependent texture variations. tile.engineersdecor.rebar_concrete.name=Rebar Concrete Block @@ -41,6 +43,8 @@ tile.engineersdecor.treated_wood_ladder.help=§6Weather-proof wooden ladder.§r #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.clinker_brick_stairs.name=Clinker Brick Stairs tile.engineersdecor.clinker_brick_stairs.help=§6Looks slightly darker and more color intensive than the vanilla brick block. +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.slag_brick_stairs.name=Clinker Brick Stairs tile.engineersdecor.slag_brick_stairs.help=§6Looks slightly darker and more color intensive than the vanilla brick block. tile.engineersdecor.rebar_concrete_stairs.name=Rebar Concrete Stairs @@ -139,7 +143,25 @@ 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.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. #----------------------------------------------------------------------------------------------------------- # 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 6a29f7a..56747df 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,6 +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.slag_brick_block.name=Шлакоблок tile.engineersdecor.slag_brick_block.help=§6Серо-коричневый кирпичный блок с зависимыми от положения вариациями текстуры. tile.engineersdecor.rebar_concrete.name=Железобетон @@ -41,6 +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.slag_brick_stairs.name=Клинкерная кирпичная лестница tile.engineersdecor.slag_brick_stairs.help=§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. tile.engineersdecor.rebar_concrete_stairs.name=Железобетонная лестница @@ -132,7 +136,25 @@ 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.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. #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_factoryarea_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_factoryarea_model.json new file mode 100644 index 0000000..58e9eff --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_factoryarea_model.json @@ -0,0 +1,4 @@ +{ + "parent": "engineersdecor:block/sign/sign_rect14x14_model", + "textures": { "f": "engineersdecor:blocks/sign/sign_factoryarea_texture" } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json new file mode 100644 index 0000000..c99e323 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json @@ -0,0 +1,35 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", + "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", + "f": "engineersdecor:blocks/sign/sign_factoryarea_texture" + }, + "elements": [ + { + "from": [1, 1, 0], + "to": [15, 15, 0.5], + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#s"}, + "east": {"uv": [15.5, 1, 16, 15], "texture": "#s"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#f"}, + "west": {"uv": [0, 1, 0.5, 15], "texture": "#s"}, + "up": {"uv": [1, 0, 15, 0.5], "texture": "#s"}, + "down": {"uv": [1, 15.5, 15, 16], "texture": "#s"} + } + } + ], + "display": { + "ground": { + "translation": [0, 0, 7], + "scale": [0.7, 0.7, 0.7] + }, + "gui": { + "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/models/block/slab/halfslab_s0_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json new file mode 100644 index 0000000..bc6e770 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s0_model.json @@ -0,0 +1,48 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ], + "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] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 0, 2.2], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..8b658ae --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s1_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 4, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..86a0657 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s2_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 6, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..2d9492c --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s3_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..e3288fe --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s4_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 10, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..3534de5 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s5_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 12, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..7aa1e3e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s6_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 14, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..a9d646b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s7_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..1be83a3 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s8_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 2, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..308cb88 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_s9_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 4, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..76367b4 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sa_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 6, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..d4417c5 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sb_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 8, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..0cfb7f9 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sc_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 10, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..59178ef --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_sd_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 12, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..c0ff07f --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/slab/halfslab_se_model.json @@ -0,0 +1,21 @@ +{ + "parent": "engineersdecor:block/slab/halfslab_s0_model", + "textures": { + "particle": "#all", + "all": "engineersdecor:blocks/iestyle/treated_wood_framed_nailed_texture" + }, + "elements": [ + { + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#all"}, + "east": {"texture": "#all"}, + "south": {"texture": "#all"}, + "west": {"texture": "#all"}, + "up": {"texture": "#all"}, + "down": {"texture": "#all"} + } + } + ] +} \ 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 439a15a..9720d11 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -110,6 +110,13 @@ ], "name": "plateAnyMetal" }, + { + "ingredient": [ + { "type": "forge:ore_dict", "ore": "plateIron" }, + { "type": "forge:ore_dict", "ore": "plateSteel" } + ], + "name": "plateAnyFerroMetal" + }, { "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:material" } @@ -141,6 +148,25 @@ ], "name": "electricalConnector" }, + { + "conditions": [ + { "type": "minecraft:item_exists", "item": "immersiveengineering:conveyor" } + ], + "ingredient": [ + { "type": "minecraft:item_nbt", "item": "immersiveengineering:conveyor", "nbt": { "conveyorType": "immersiveengineering:conveyor" } }, + { "type": "minecraft:item_nbt", "item": "immersiveengineering:conveyor", "nbt": { "conveyorType": "immersiveengineering:uncontrolled" } } + ], + "name": "normalConveyor" + }, + { + "conditions": [ + { "type": "minecraft:item_exists", "item": "immersiveengineering:conveyor" } + ], + "ingredient": [ + { "type": "minecraft:item_nbt", "item": "immersiveengineering:conveyor", "nbt": { "conveyorType": "immersiveengineering:dropper" } } + ], + "name": "droppingConveyor" + }, { "ingredient": [ { "type": "forge:ore_dict", "ore": "ingotBrick" }, @@ -240,5 +266,9 @@ { "ingredient": { "item": "minecraft:lava_bucket", "data": 0 }, "name": "anyLavaItem" + }, + { + "ingredient": { "item": "minecraft:dirt", "data": 0 }, + "name": "anyDirt" } ] \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json new file mode 100644 index 0000000..db33ab9 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json @@ -0,0 +1,17 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:clinker_brick_stained_block", + "required": ["engineersdecor:clinker_brick_block"] + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:clinker_brick_block" }, + { "item": "#anyDirt" } + ], + "result": { + "item": "engineersdecor:clinker_brick_stained_block" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json new file mode 100644 index 0000000..ec80be6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json @@ -0,0 +1,24 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:clinker_brick_stained_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "C ", + "CC ", + "CCC" + ], + "key": { + "C": { + "item": "engineersdecor:clinker_brick_stained_block", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:clinker_brick_stained_stairs", + "count": 6 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json new file mode 100644 index 0000000..11d939e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json @@ -0,0 +1,23 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:clinker_brick_stained_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "engineersdecor:clinker_brick_stained_stairs", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:clinker_brick_stained_block", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json new file mode 100644 index 0000000..6dfecd4 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json @@ -0,0 +1,16 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:sign_defense", + "required": ["engineersdecor:sign_danger"] + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:sign_defense" } + ], + "result": { + "item": "engineersdecor:sign_factoryarea" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json index 68d042f..9270d8a 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json @@ -3,12 +3,12 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:sign_hotwire", - "required": ["engineersdecor:sign_defense"] + "required": ["engineersdecor:sign_factoryarea"] } ], "type": "minecraft:crafting_shapeless", "ingredients": [ - { "item": "engineersdecor:sign_defense" } + { "item": "engineersdecor:sign_factoryarea" } ], "result": { "item": "engineersdecor:sign_hotwire" diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json index 7782f48..bed1e59 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json @@ -3,27 +3,20 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:small_electrical_furnace", - "required": ["immersiveengineering:material", "engineersdecor:small_lab_furnace"] + "required": ["immersiveengineering:material"] } ], "type": "minecraft:crafting_shaped", "pattern": [ - " C ", - "HFH" + "PCP", + "HFH", + "PPP" ], "key": { - "F": { - "item": "engineersdecor:small_lab_furnace", - "data": 0 - }, - "C": { - "item": "#electricalConnector", - "data": 0 - }, - "H": { - "item": "#anyHopper", - "data": 0 - } + "F": { "item": "#itemFurnace" }, + "C": { "item": "#electricalConnector" }, + "H": { "item": "#normalConveyor" }, + "P": { "item": "#plateAnyFerroMetal" } }, "result": { "item": "engineersdecor:small_electrical_furnace", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json index 9a4b322..42fee34 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json @@ -3,7 +3,8 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:small_electrical_furnace", - "required": ["engineersdecor:small_lab_furnace"] + "required": ["engineersdecor:small_lab_furnace"], + "missing": ["immersiveengineering:material"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json index 8562a52..f64e06d 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json @@ -20,6 +20,6 @@ }, "result": { "item": "engineersdecor:straight_pipe_valve", - "count": 3 + "count": 2 } } diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png new file mode 100644 index 0000000000000000000000000000000000000000..9edb948eaaf7604ff2fd21d4bed1b823102589d6 GIT binary patch literal 764 zcmV$U zcb~KOTFW9n!3Upw^7>&|-Lo79Ubt|HpRa$(qdMUM+d9+TaEBo$Uc3AeKYaB$BEpQ2 z%RrXisB=d|SZ~%G?<%u7ZcdM2GmM++RPYBrg>0nrFX-+V*$%j znEFJtJsWl0o#>6lknjkGoRBX*`!vFXTr%tRn%+DA{C$L(p*eH<;6Aw&ma7%dJoh|x zx1;xt2Z##!_uDsUt+AgP-3>!&1RBCC7ccSsci+WLN%u(<>bL%Bvpbyv!W4B5LiGHp`=VRBSdNQ%v>i#6hv@y zNC}G|rG#}Ozxd9(xI1RX+&kOTGg40UHsiocZ@$eu&4?=FP#6~@B^Po|j}PwMzRuC{ z2^PVt?_cJZTQ{lZM1Z-02w8+A!pj#f^4pyo?CZ>;WbU?3K0d2N8Sq-cp_$XVVFVG7 z07*bV$(baAhqG@D0aOTLsvyC?_wS*qBvm{B4^XghTm==Sw$3;XxH}-owX0X+&$~ZS zr^foJ^9-8}+eceO1XV>QUp5#A9afZ;ND0K+{0000 literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png new file mode 100644 index 0000000000000000000000000000000000000000..0b868fdf0007d9bb5c7f001799f26930af484e40 GIT binary patch literal 743 zcmV?P)3L+bu_yr7vi3DLm*ibM~WKdW%5KY8rLnG0|NK6%GcV@b} zs@|V_uR)LgKEXMMpM3cGE3SEA-E}PDXu2{1Qax_6(X&6wte(i+7D zZ5bR42f!TEjH`LUL>SbF5ei^v}3pcEomd)C|l~F{avBX~2PEiZ*2`6*niP zW232_akugc~=X Z;a`o^oYCfwp(X$T002ovPDHLkV1h1NR6qa# literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png new file mode 100644 index 0000000000000000000000000000000000000000..47d34ecac72ba14030219a0f8848873e6489ca26 GIT binary patch literal 749 zcmV_wth@~J}3g+WN?#DTM zpLf4&EsJvtr=DSEU`9T?_EP$8z$3Z()-C?}?rR>LZ75nO0$K$3WY!s1-+q@rzP*DW zRD`06No$-B6)VbWz2a2nsR^NfKHBI2kHr(lWU;pP?jk-$-{@ooc5If zLIgoDGt4@MTG?zis0x7q!lsVMXPFGJi9`?`OA82jlbQsw*M@2!vRCxZi8~pk6_x$ZadLuLOgrbGjtmE11N7%`BU>GYk zh3WwkD2kc_(AS1%U;qhZGVctJq*%e`ol>)~M6nVONsYh(D}~v_Ad*F=)aJ~sFtlLW z8MEmOyK?Pyu3Yrl4n3wuWN`WMODt9^UU>5+wbs3(3d`k!&1MTgF~#ova+jexp22fB zj`;2N7epo?L^z3{A~bhie*Xi0{pw4q2dl2biee}Ijto$N`E-uBQ=1bPsp7&pBJt)N zEEhcLcbx8aEIPx;#EOz6Pd@boqX&5*6ai5o5>fKVc0{ia|25f~hci z(3OHmP((265P{B&h(HYr5SbKYKjl~6d5`1cM>HSlCLKhA3KQ!<;ptbe<6|R%HddC) f1rhrvcys;(P9R`E()WeC00000NkvXXu0mjfj?`F( literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png new file mode 100644 index 0000000000000000000000000000000000000000..89dfa2363f253b685d72151ea3fb44f753089e3e GIT binary patch literal 746 zcmVwUCg)KAn{|i8u(8%3JUj1VOMD5e6G$5MjIr>wuML5u2pQB$;#eK6`&Z zYgx=KJUsIC{g2(&1vK!%rw{n|@>fn`pgU}0U@nE$9e3y6qpx^+@dF}4L5L|6r8U;l zsA`xyQ+M{u5$i?>NWIi%=29Az=V+^3!+UxSR9x>WXn35fKysM?=JVM^u>(6T92DD9b`?jbU?wW5j2d zPpGx>dMz;RuvX5<*qAS9GAM=}6{V8oydITPQ1@Ff7# zJo6sH^_y#AO1K%V8}Hozgjx!D*bsuSE-T|W0uW*#{&)G9d2P(Karf*I|6D$ym~#@8 z=e@BQL=i-UyI-91=f#hh87Tyw#X!887R;Qv8T;!!b2DnGv;d_$wHqR^8wSjbO^O_r zm1Ap|brd&JP*5kOL{w!vB+$Uxjq2bCuhv2>4Ffit4XR2A5&8N1Zyn&})hluyXtf{$ z?#{XvL+%b2e2<5oo4r?@L@ zk}B>F2&#$*25k!=rdSkFGh1x4QXO{U0Dx?rO-EAqQ&}+losbxh~F}qp% c_MJQY50vbEfv^xxkN^Mx07*qoM6N<$f&;Whga7~l literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png new file mode 100644 index 0000000000000000000000000000000000000000..e1804d4c42f022d397b2fa3a98e5b697091b9e1f GIT binary patch literal 746 zcmVcAt1a$uo49WqN0T_g^m6O3kfJTijBmO+>dk4 zK6~%AES`}03&tFC%7<^f=53i7QsRXh@AA`UpYrfHlR_YfFqc9f1327x{{w#g>I+nb zijcaVD7CPx6#xW^0V1re(aaEpxm1EGBJl6LV6{=r*z_G*S|i0kZcZtMD8eQs%pF9D zF_L1!fN7dp@=9}K>>^PW`TXOLywyfb5!Jvl&zw#t+#CtYx?~Uts%&;UhOR>dL<0!K zU%vj5O$R3?ZBKX`&`J?Fd(If0-}N#ob>@U0~MM#`jBX~ zA@?rsI>6y@#08G~6T4@&Ow)uph#M(I#=@5+9uw%$#bDRi~MOIUXEyz#LP@5X!ou zBK&hW0mAuqL~$bpMbsI_fwLItqhcnQIWADlsem=7He)V^y94sn!MtR;z9TOS^EB}^ zLf3UTu-R_0)(9~$Pcxgdk@)xh?>Oa*N#Nm}*#tN(g~Ph?`t3XXe)%n!({MT!6sPqg zwHdG6e24gWtypaw^Td)X2fy-hz8wK*X3TlT1*!@Plw1iaENdnX!@zOPTpN1Elz5yA zZce9q^#u{S6iEWDHOw3X0#{SYy^FiPEGwlIx~>B=P^C|a&2C4|nYyl+Ls>Jb%6`8G cV7t4yZxShY3$-muAPOm7@z}T961~g>}sc%O7ITTJFc{bHHOrcoHId$g|%2?@FI9; zQNU^A9Idhlj;cy<7Www8FZFmhl5%DoM^>wm>2xB-iS=efZxt~H?VZ);Ip!E?tFsqgZmuj#C|Sx?HDm2f&e$)zv8#MKb-4$ORNpVGFl-RxbeX!xKb*oR0!6bVTt0! z&{YBGO;MEnoarJMIz=tU8LYP$)eZszh%p3X$*p3n!CQw|0TrCHh$LVp)rNcN z_In(U$MZFyq{3o3puJODn}dj7$-`tIPWPb z183uMTr$Op5CU#>jfJBAz14#en*t5i zm8o_90fG^hs}-$xUcLPeZeJRuHFnd?lq&)R?`XBM*{pE_u@u^~7q$j^IADx0=ZqPK z0e42g!daHV17Jn)-eVAgcZ|+52x#wgJ?{p|d#kE@ zriYnrVNHw_O$p@Lj!X$(8OTZW!s+V z>b_O?$2kUV^u5^!k9>UVRc})Q4LtMqZT`A{k0B_{VG#p|oT<&(<;n}U@9_Kg-*VbT zGD7TnqSV5aD@_e^TAAuVus}(UQ z0t|~K2*kgCzRzyT%(?PFoa#cgh5)Z!e!y?ve94#_Lku)C&_KZH1YW-TJ~5clYNc8u zo8dqZ0ZM}|1{6m{sAi}NB^Tne zZ@q)LbJ!m+pya}OeS`ft(#&}J^*1P`uvnhZ#Q-?_LqbIeQIQW{dfszu#1MJz)|)*1 zJUTVm3QCck00-` zxgHs-z{JN4t?_7dRVwT!gtA0(7zCd@=BNx5v%t{?~L-f(Y(@G?=DLX@$P;!3?P){6sntq3+kK%yeV_pq|DOqIeXkW+{#8X{u4fDd35NTc8lo5bL8-R5Ns zi+xc4`Y-;geE9ke|7)624ZQN&oBaCl0RZNZf@0RF<|KjZ@7?By&(1(VLtr-y#F8^} zu7u!hd1GnDv}Mek6qH^C19Z1znr5Mi73$0a#ab$OCM|^be z3;vuJ6hTC&=5#SoTI0ss@ACM&`;=zvQe>?LsthW0;#_~{17gk@0oGD!?zjk3sW=yk z4IJl>^M$!o1V|z9(tbo^AkMjvFGvR9g5#(NF$6^6+4)9w=cJ2_sl(kd5v(=j?Cu?( zripo8Frel_KlHd6XkeXZN+~Ssh6?{;f7tWl)vLr`?tjkHIkVQrwVSv2{;N+}sKa@+05vNffxeSoMKK20Z}0eh$yOxd811mYtDfFmq9L-E+z81v8)UKN9sBZ zc;U(wrfFi`HkNte`R5MA-@f^hC-Z_!plYCP3o1g2k(b|iiyt4{1A~h5GaxwHk2Eu0 zeg8J`S+3;TnDWBf97Q-uk)<>MnmJ3(xBv(WX!#peVa=Jil*;*9EaMNW2?*m9S zN_@gO1PRR~hJoDTg8?VU{L_IiMwCMk2!<4il4VJ-P1=(9FddWP&hB(q>d(Ifgw1_Wjsp+5r`^e0})UJ2i%=(*3WTo z=E=a`ttJ@RpvuNH>KK5fnmZqUL{UtzqpyfDq5|0r7r_iv1v5ugz`+4?Ckm*5h*Fy& zvb4JZ<^&b$?cWe%qoz8-;jGTt1Yu)DLvqBe4>5gc(x91w#rL2^QZVkqi{xwpG^ z%)!mk7<#*l;0S8Q+1q1wx3{UYF^OReAO>aEFVNE~?)>pnM7pp6DvXn|k|KQk)O|Qu z`|R$dC;ucK|IAuB>HiZ)>sYh42#81%N&yvZsUWM=Si1Hh9B=(QVvTci#|&bONSzw8 z3<0PJhM+WL(x3uxyC?^-X@ANsV2 zFkYjLYL}K_0OK;B(i*(~Z#N{J7PNEs_V<9jev#AD6E?TD`s4TF>lbKHe!I8FaKqUl zXZrk)NhqK$G-s|$!XOX~zE?Q#r%yf^(hm{gu)8Ls$h7XaD#6?Eh}Rg)^|K_8Yto06|63YbUorNCL7p*7&=_Z9o%z2^y=j+ z=GA zRlT$CkG|*eqsLTLMM{msX9v%C{OB<$rGBhVHKK~UFQE$8IH1G)nRnvdOseae%gak% zym;B~x~>~v)Qb75rU%no`xiwHA)p4UM}Vf za?Z@FIY);_96UMT-Me>8r&G+0Z@>A52mgA|$gDTwa(;f!!!I8K&g^Q2yHUhqnLu+e z8IfotL?UBj2!T4+%9A{EY zsO!3Q@3=KmJV?q|irv9-!hw3R0AT&@UDnoa;pS}ZY!ft4r<(Qkb;`*E9B$pdO*tts zH|}lRBgO#Uq)~BrU&_fjGhLgq`@t?D2FkKzb9)Onrz}f0Ha8Fz z?%rKzV{-$5wOea!Zf!MuLWprGHP-R$Mj`T{M7Pa^8ME08ohu^R97$;uZ8n>cQsV0B zisR!G%5s9cGrOt~Z7Pph#&YfzF$N(9d7lzCwL7+{=$eYliwi=Cq*QZ${v)c2S?2Qc z5**61WInH$&8~V5I8AF-PRnM;-YqKERBHqvsL-7g%bAZp{+JK~AqL!Xb5gwR9aPCV zqpIYTn?@BOn=zS0ax%;^MN#w-2qFXth~z%nqiTocogzTnQU_bDeO^XCtmCepzzlTb-O(<+Mzd z9P^C3pg}2v^!A)GAqK>Z$*=a2vgGpVLvEMF7{IiM{B(B4_RbFLWkf{UOGzYWCx+0D z2|+_!xSSx7TV*EY(DFlxVQIG@hzjD$>+^Hs)+R+5)WGg?nh>HpDo#dQl6Y6*391Bv zY))vy+bS^04R5= 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.", @@ -54,7 +55,7 @@ }, "promos": { "1.12.2-recommended": "1.0.7", - "1.12.2-latest": "1.0.7", + "1.12.2-latest": "1.0.8-b1", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b3" } From bb5b525f66bded43e4d9686a98767111ee4b911b Mon Sep 17 00:00:00 2001 From: stfwi Date: Fri, 7 Jun 2019 21:55:04 +0200 Subject: [PATCH 4/5] Added registry name wildcard matching based opt-out config. Fixed issue #30. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 3 +- 1.12/readme.md | 4 + .../engineersdecor/ModEngineersDecor.java | 1 + .../wile/engineersdecor/blocks/ModBlocks.java | 3 +- .../wile/engineersdecor/detail/ModConfig.java | 117 +++++++++++++++--- .../clinker_brick_stained_texture0.png | Bin 764 -> 737 bytes .../clinker_brick_stained_texture1.png | Bin 743 -> 748 bytes .../clinker_brick_stained_texture2.png | Bin 749 -> 740 bytes .../clinker_brick_stained_texture3.png | Bin 746 -> 738 bytes .../clinker_brick_stained_texture4.png | Bin 746 -> 756 bytes .../clinker_brick_stained_texture5.png | Bin 756 -> 738 bytes .../clinker_brick_stained_texture6.png | Bin 758 -> 748 bytes .../clinker_brick_stained_texture7.png | Bin 743 -> 734 bytes meta/update.json | 3 +- 15 files changed, 112 insertions(+), 21 deletions(-) diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 0c49c36..43126e0 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-b1 +version_engineersdecor=1.0.8-b2 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index c320396..7d4a67f 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.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).", "1.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.\n[A] Added standalone recipes for signs, factory dropper, and electrical furnace.\n[M] Adapted \"Caution\" sign backgrounds to the yellow defense system warning background.", "1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.", @@ -42,6 +43,6 @@ }, "promos": { "1.12.2-recommended": "1.0.7", - "1.12.2-latest": "1.0.8-b1" + "1.12.2-latest": "1.0.8-b2" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 6048e63..c8ed268 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,10 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - 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.8-b1 [A] Added "Factory area" sign. [M] Electrical furnace recipe changed (hoppers to conveyors). [A] Opt-out config options added. diff --git a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java index 141bd39..87a9e35 100644 --- a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java @@ -97,6 +97,7 @@ public class ModEngineersDecor proxy.preInit(event); MinecraftForge.EVENT_BUS.register(new PlayerEventHandler()); Networking.init(); + ModConfig.onPreInit(); } @Mod.EventHandler 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 d9a4d01..bf05ea3 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -435,7 +435,8 @@ public class ModBlocks ++num_block_registrations_skipped_noie; continue; } - if((woor) && (ModConfig.isOptedOut((Block)e)) && (e!=SIGN_MODLOGO)) { + if((woor) && (e != SIGN_MODLOGO) && (ModConfig.isOptedOut((Block)e))) { + ModEngineersDecor.logger.info("Registration opt-out: " + ((Block) e).getRegistryName().getPath()); ++num_block_registrations_skipped; continue; } 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 1cf5e69..9b2c77d 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java @@ -20,6 +20,7 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import javax.annotation.Nullable; +import java.util.ArrayList; @Config(modid = ModEngineersDecor.MODID) @Config.LangKey("engineersdecor.config.title") @@ -30,6 +31,26 @@ public class ModConfig public static final SettingsOptouts optout = new SettingsOptouts(); public static final class SettingsOptouts { + @Config.Comment({"Opt-out any block by its registry name ('*' wildcard matching, " + + "comma separated list, whitespaces ignored. You must match the whole name, " + + "means maybe add '*' also at the begin and end. Example: '*wood*,*steel*' " + + "excludes everything that has 'wood' or 'steel' in the registry name. " + + "The matching result is also traced in the log file. " + }) + @Config.Name("Pattern excludes") + @Config.RequiresMcRestart + public String excludes = ""; + + @Config.Comment({"Prevent blocks from being opt'ed by registry name ('*' wildcard matching, " + + "comma separated list, whitespaces ignored. Evaluated before all other opt-out checks. " + + "You must match the whole name, means maybe add '*' also at the begin and end. Example: " + + "'*wood*,*steel*' includes everything that has 'wood' or 'steel' in the registry name." + + "The matching result is also traced in the log file." + }) + @Config.Name("Pattern includes") + @Config.RequiresMcRestart + public String includes = ""; + @Config.Comment({"Disable clinker bricks and derived blocks."}) @Config.Name("Without clinker bricks") @Config.RequiresMcRestart @@ -80,7 +101,7 @@ public class ModConfig @Config.RequiresMcRestart public boolean without_electrical_furnace = false; - @Config.Comment({"Disable treated wood table, stool, windowsill, pole, etc."}) + @Config.Comment({"Disable treated wood table, stool, windowsill, etc."}) @Config.Name("Without tr. wood furniture") @Config.RequiresMcRestart public boolean without_treated_wood_furniture = false; @@ -145,6 +166,16 @@ public class ModConfig @Config.Name("Without slab slices") @Config.RequiresMcRestart public boolean without_halfslabs = false; + + @Config.Comment({"Disable poles of any material."}) + @Config.Name("Without poles") + @Config.RequiresMcRestart + public boolean without_poles = false; + + @Config.Comment({"Disable horizontal supports like the double-T support."}) + @Config.Name("Without h. supports") + @Config.RequiresMcRestart + public boolean without_hsupports = false; } @Config.Comment({ @@ -290,9 +321,16 @@ public class ModConfig } @SuppressWarnings("unused") - public static final void onPostInit(FMLPostInitializationEvent event) + public static final void onPreInit() { apply(); } + @SuppressWarnings("unused") + public static final void onPostInit(FMLPostInitializationEvent event) + { for(Block e:ModBlocks.getRegisteredBlocks()) ModConfig.isOptedOut(e, true); } + + private static final ArrayList includes_ = new ArrayList(); + private static final ArrayList excludes_ = new ArrayList(); + public static final boolean isWithoutOptOutRegistration() { return (zmisc!=null) && (zmisc.without_optout_registration); } @@ -300,37 +338,62 @@ public class ModConfig { return (zmisc==null) || (zmisc.without_recipes); } public static final boolean isOptedOut(final @Nullable Block block) + { return isOptedOut(block, false); } + + public static final boolean isOptedOut(final @Nullable Block block, boolean with_log_details) { if((block == null) || (optout==null)) return true; if(block == ModBlocks.SIGN_MODLOGO) return true; if((!zmisc.with_experimental) && (block instanceof ModAuxiliaries.IExperimentalFeature)) return true; final String rn = block.getRegistryName().getPath(); - if(optout.without_clinker_bricks && rn.startsWith("clinker_brick_")) return true; + // Force-include/exclude pattern matching + try { + for(String e:includes_) { + if(rn.matches(e)) { + if(with_log_details) ModEngineersDecor.logger.info("Optout force include: " + rn); + return false; + } + } + for(String e:excludes_) { + if(rn.matches(e)) { + if(with_log_details) ModEngineersDecor.logger.info("Optout force exclude: " + rn); + return true; + } + } + } catch(Throwable ex) { + ModEngineersDecor.logger.error("optout include pattern failed, disabling."); + includes_.clear(); + excludes_.clear(); + } + // Early non-opt out type based evaluation + if(block instanceof BlockDecorCraftingTable) return optout.without_crafting_table; + if(block instanceof BlockDecorFurnaceElectrical) return optout.without_electrical_furnace; + if((block instanceof BlockDecorFurnace) && (!(block instanceof BlockDecorFurnaceElectrical))) return optout.without_lab_furnace; + if(block instanceof BlockDecorPassiveFluidAccumulator) return optout.without_passive_fluid_accumulator; + if(block instanceof BlockDecorWasteIncinerator) return optout.without_waste_incinerator; + if(block instanceof BlockDecorDropper) return optout.without_factory_dropper; + if(block instanceof BlockDecorHalfSlab) return optout.without_halfslabs; + if(block instanceof BlockDecorLadder) return optout.without_ladders; + if(block instanceof BlockDecorWindow) return optout.without_windows; + 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_stairs && (block instanceof BlockDecorStairs)) return true; + if(optout.without_walls && (block instanceof BlockDecorWall)) return true; + if(optout.without_poles && (block instanceof BlockDecorStraightPole)) return true; + // String matching based evaluation + if(optout.without_clinker_bricks && (rn.startsWith("clinker_brick_")) || (rn.startsWith("clinker_brick_stained_"))) return true; if(optout.without_slag_bricks && rn.startsWith("slag_brick_")) return true; if(optout.without_rebar_concrete && rn.startsWith("rebar_concrete")) return true; if(optout.without_ie_concrete_wall && rn.startsWith("concrete_wall")) return true; if(optout.without_panzer_glass && rn.startsWith("panzerglass_")) return true; - if(optout.without_crafting_table && (block instanceof BlockDecorCraftingTable)) return true; - if(optout.without_lab_furnace && ((block instanceof BlockDecorFurnace)) && (!(block instanceof BlockDecorFurnaceElectrical))) return true; - if(optout.without_electrical_furnace && (block instanceof BlockDecorFurnaceElectrical)) return true; - if(optout.without_passive_fluid_accumulator && (block instanceof BlockDecorPassiveFluidAccumulator)) return true; - if(optout.without_waste_incinerator && (block instanceof BlockDecorWasteIncinerator)) return true; - if(optout.without_factory_dropper && (block instanceof BlockDecorDropper)) return true; - if(optout.without_halfslabs && (block instanceof BlockDecorHalfSlab)) return true; - if(optout.without_windows && rn.endsWith("_window")) return true; if(optout.without_light_sources && rn.endsWith("_light")) return true; - if(optout.without_ladders && (block instanceof BlockDecorLadder)) return true; if(optout.without_sign_plates && rn.startsWith("sign_")) return true; - if(optout.without_walls && rn.endsWith("_wall")) return true; - if(optout.without_stairs && rn.endsWith("_stairs")) return true; - if(optout.without_valves && rn.contains("_pipe_valve")) return true; if(optout.without_treated_wood_furniture) { if(block instanceof BlockDecorChair) return true; - if(rn.equals("treated_wood_pole")) return true; if(rn.equals("treated_wood_table")) return true; if(rn.equals("treated_wood_stool")) return true; if(rn.equals("treated_wood_windowsill")) return true; - if(rn.equals("treated_wood_window")) return true; } return false; } @@ -351,6 +414,26 @@ public class ModConfig BlockDecorCraftingTable.on_config(optout.without_crafting_table_history, false, tweaks.with_crafting_quickmove_buttons); BlockDecorPipeValve.on_config(tweaks.pipevalve_max_flowrate, tweaks.pipevalve_redstone_slope); BlockDecorFurnaceElectrical.BTileEntity.on_config(tweaks.e_furnace_speed_percent, tweaks.e_furnace_power_consumption); + { + optout.includes = optout.includes.toLowerCase().replaceAll(ModEngineersDecor.MODID+":", "").replaceAll("[^*_,a-z0-9]", ""); + if(!optout.includes.isEmpty()) ModEngineersDecor.logger.info("Pattern includes: '" + optout.includes + "'"); + String[] incl = optout.includes.split(","); + includes_.clear(); + for(int i=0; i< incl.length; ++i) { + incl[i] = incl[i].replaceAll("[*]", ".*?"); + if(!incl[i].isEmpty()) includes_.add(incl[i]); + } + } + { + optout.excludes = optout.excludes.toLowerCase().replaceAll(ModEngineersDecor.MODID+":", "").replaceAll("[^*_,a-z0-9]", ""); + if(!optout.excludes.isEmpty()) ModEngineersDecor.logger.info("Pattern excludes: '" + optout.excludes + "'"); + String[] excl = optout.excludes.split(","); + excludes_.clear(); + for(int i=0; i< excl.length; ++i) { + excl[i] = excl[i].replaceAll("[*]", ".*?"); + if(!excl[i].isEmpty()) excludes_.add(excl[i]); + } + } } } diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png index 9edb948eaaf7604ff2fd21d4bed1b823102589d6..25fac1a422b9b8e1a4865288741d1ee05c2cc283 100644 GIT binary patch delta 674 zcmV;T0$u(51>psdOMih$L_t(I%PrGOYn@dTfZ=zoz4v!HCzl!&oheESrLBRYr~?&o zUMM*A_jY2Tqc~_Ch?5{8X-;y^ciDTb<)Hq97am@D`Sf8VtDKGl>G3)3&o}I*g)Sv( zGb|kUz&!Z;r(byg$1AEk6(K~?UV^nbcgsRbncAEHZs(Qz+JA^pS_GuTI1Ehg?AHeF zM62X###l0a&X^l+j)tN*A&{k!e5I5Db7!MMHxvL=l*|{82vv^G&bYj~Vtn)jSyyyk zNUGR!V7nO^H(T!ad*tC$ioogdF|{>v_s=^D@bB9O;oOB#!;yf`zWI)u*B4A4R8^We z~@GKVU4gxmIx+m2*Sag zq6t+n6bT4(77ubt6dVr_YluL}nSA>7bNW(HRdUL#%SsTK86f2I=ST=kt$g(0got1m z1`dabsWq~^yWsXPkwtj${g2#Tydi+*fe^HSK^0Y@e1G}_*RNl(4@Xr$h|RT;x}IiE zNdoysvC4&VKa{W2Os=`56Q-gH~;_u07*qo IM6N<$f_Q{LDgXcg delta 701 zcmV;u0z&=a1^fk&OMje6L_t(I%Pr8qid|I{z~SFod+&4Zzc^y-tV9v5thAU~w9`V< zM1qADl0xteEQNrO-a?dAAwft2f}Kww7J?cC4Th-Wn3>$Ucb~KOTFW9n!3Upw^7>&| z-Lo79Ubt|HpRa$(qdMUM+d9+TaEBo$Uc3AeKYaB$BEpQ2%YQ(Y-l%g&L|AXu9PcW# zIc`pmU^9%IwT5W|U<$CgF%B7@D%#8#OQv~HYo&L?x?=&$QkeQgv^^Vj+@0u+#gOm_ zhMbTuKKnGngIqG}^_t#0|NMP~nV~sz`rtmf6qc(M&ph`$b+@DUjt7Ve`S;s5XsxlI z8r=;;X#^U=D}NU+@%?w-()JSzP5dar=IQg;*$yN){P1IPYn|;hqat{~-VGJSaN68( z5*9)=rzGX%!Cxd*fu`C zfVqJPS%f6Q%NH*4+npQi>&&8L?zT=oKC46-@LIv4nbW#q1QCz`NkBl!nIwXTvu_On zR0v|KAi=-)@1d$BRXhL>P_S@Z1r?>X&NvRZJ0Qrlt5@RByFXE<#`>xA44VzxM_WV$ zRYg@hNL_t(I%RQ4ji(XX}K-b>qoO{35%*4^Cjh&<$As9raun+`` z6ek9xTnco_}T{pw>WCh*CJ&?^(>4 zs*wn2l{~F0XMIm~I1Wb$p-+VYFwYC-&ZcBUpwAik=JQYE_49Mqb!BZv zR%MwcJc4_#p0iF9&77`e_WJ`8&T$;s^gWyHhCKaz#dCpbMiQYbh0%i~!u=0F;*YEE zSCkMK&u-$C1 zW>hokvas828K#Ms*GIOe2lDvrDc9x%aC-5Oe}4astbfXlKo&@<;Et+t|KWQKzh3e8 zFcCmf$Tw@H(}b#`k{FhiUCET3n3|Kg3utECjw4cyh@ex5fV|6z)q?A3qKqS1g`0UH zsosG}Ig3OK=(>*Ed8Q91NyY-?yRW{8WnCG@33Eq9=u1IWxfupFeNQe0H)Frw^UBGA z&2~#l%71aVCBJy~6B5qcoY9;fqa|fq3U6FI;`xtHaC00uYzlumOrqHBz=Ox1kZUtE zoQ!j-P+jPA!4dkBDa|l~-kq1Xm4?uTGpvnLGC7xwx5_>h%!4ihiNHK4rMsKP9VKvg zGO&73R1s0~Tkl_TydKc3bX|wHhN#k&Lci^K`zGVZSZnMK2izKFhN@C)g@FG6I9Phm T(T;bh00000NkvXXu0mjfnc_@n delta 680 zcmV;Z0$2U)1?L5jOMiz+L_t(I%RQ1mizHPPN6&rlRdrW)&#s1RXtXP6Vqj#TncxP> z3L+bu_yr7vi3DLm*ibM~WKdW%5KY8rLnG0|NK6%GcV@b}s@|V_uR)LgKEXMMpM3cG zE3SEA-E}@y(ZL(<3%c zOg$A4VEyiWet&uNHEPbYn>Ff2pArc$H(t7TpQO#0=7rK4#RY8{91I7*9Mp`fdBH>& z)QA#5Af!mh%S=(FA*eezs5^qt#e~SQNsNJY41mzwh#_FA$l1dO4ls@*<219s+|#dm zaA!RXfKy9B&8a1`Ua$FYw_mt}oWAz5&qbM=a_8>b{D1!acT_W?2&zgK1GOn4!tFQi z^7rGPIpo4BMmmA?&$wWA#CCPm49rn6rrKC(z=2|lHf1UmHz%cIqrmmsB!HSSq(oI? zsfxhS*BZ&4-FAoOOlJ)<0|fc(<5LI7rO{d=#lSqz44dJ9*Hzy$PBWX$hIyLVooo?= z&9El@^?%ckJQ*ik0wG3Dq7y_YX1w^;d;I$C8Ko+QGq_O^;gOMiq(L_t(I%Po`3idqoLg0?N_Q6oA1$I2ok$EKW?;ZU z6yNv_et?5aoICTA#6S`U5`>@=KS0C~L}MqNu6yg=d(Ph5LFEtDVzK1w_pSzYrkZp0 zi?4Wi?>0~S0aVE%csL$HR^|1ZAM?lE+aOR8mN}Di7(+9LT7Nm;^$fKELYPwpRD>Wf zRa$M#Ze)aJ&g@Q(2m+WKtXBT(M+7KI=|nJ96vfQ2*2pOl0pURlkne7N6Z1UN4|^6} zhpJ+&()RbAbzF=iT~g+0rkT-NBmZ;%Cxqa9Khs;#%t2t46Ib4Tm&d>V z%Ae+hHB^KyC4Ug5D~Z=`+$0avOl`(Kpcx>72#mE+TVQfR0|@4)Av8%uRA|r9)Fwx%^VRS3An?nAAQ23J3lg1 z<8qgIlry=XDj;|S?t!$1Szyoex(Dj<}c`0ayS5 zqF@ntz-qB%vPwybE-4_$_ut+MMCkW>j*gERb~`S1JHmscN+}t6PMC6LyFKCQ`7??N zr4;htKY!n4oGUJghY_SUv0W{ZoT+bKfpOMi_?L_t(I%T1F#t6gOjgrBwEwa@pFn0wVCm3Atm5JAu`g`kEY zTw@UhE&LHyB8Wf1!p_13L2X2Bf>_wth@~J}3g+WN?#DTMpLf4&EsJvtr=DSEU`9T? z_EP$8z$3Z()-C?}?rR>LZ75nO0$K$3WY!s1-+q@rzP*DWRDXn`ib-pn4;3rQYQ5rY zR~bDS+XxCW3P}=L05};cWYRLZG@qd@ob_}<@5#f5$DH<+073*oFf+_LhFaNdHmC}L z0K%q@$Y-B?lmZO99rO7dfMMIy4?S86;m+aVAsNByu{FbX%jxMk$sYF4-5+Re zG)F~2z*KntwSOD@`SbVu?Lm4YGx3C?h1IO%+3QEx$#!5ED>a4c0TL*RngY<*hG$>^ z31l+w43DH(!RDP(v#><55)es^zyT|T*~B1{MW@u}%&joAVA>h8=?uGa?RBnP^w|zQ zrbc9N`SD9ERx4h3^Cq>{y`u`t<$}#-3qUc&?)`F?p?^A_!E-l``0e%=L?$3aIEkPl zGPxBztFFU}VkiBM3{ZjjbdI=Fn-dqQ;=(y1@#Y*X7d+~BobGlkI>X4s zijpKxKJ^5n2YDeB0Z}0mQUq0{dP7y1Spfw3{L_yUpqq4DJ~&|4_uRk#fd8X4CxOLs z!D_i=+kf|LH(TbjDfaJAKeDZrkiyOb^U8WUA++$!8%O;9&24H+f<%C|Dcx#~NATj! zTiCtxp7aI+9(&Se?3vhp`>KVc0{ia|25f~hci(3OHmP((265P{B& zh(HYr5SbKYKjl~6d5`1cM>HSlCLKhA3KQ!<;V0==uj6AQfi_l_%LNhpCwO!I15O}d UKhpPwy8r+H07*qoM6N<$f)e&ka{vGU diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png index 89dfa2363f253b685d72151ea3fb44f753089e3e..1f173300321334a7dffbd645e41e3441299ef3e4 100644 GIT binary patch delta 675 zcmV;U0$ly-1>yyeOMik%L_t(I%Po^Vi(OR|K-b>qocrL#$T}3DwaI@_`|rFCKTcF+wXY( z_!nMI2l`UTB6v6+LRRJO=U;O5_%{%!2t&?fS|!|>&A6EktbgY8DHG;Y0Tm$#OqJG* z)s2kM%vs&Zb8D;)E(vRmmxmJql%#Ybm@0~5X1EzSB_bd^XaVxW!|x-fguCMrbfrTh zSeAux90+&LFD@9mj{WI`gj1K5W=3sBKK%8RZBFc$%E5wW4gzCNTzqiJzt8^UA9KPQ zDngeMh|-nB=6}79$n&ydRha{t0V0UNsW#TyI4zADhDNaKGDJ{v!UN`YArCoG12#!G zX^;bIKoy}c1xdnI3PTo}8DmMT))@Ojzul0x@84rH4s6De{WReY5WMxq>r{7Md-WRx zp*ADJ*=$D+(~)^T5hCRJ_cN}|Ng}**|5IN4{wwCe3x5xqJ6V+^;0|wo@ikXJ|HQEx zV^%g@M?S2TEJ_PUG+}FHu|Na>*5;HXG!KsR%=tJ{{m5L6q!kqckHEv&-PtiWBdK5k z1c-t~-~nUbvsfjk#8?s_$d8X6#%35uC3ENOjN>%1pC-bCq)I6nLH>up`NbK><4n<8 z#eDtr34enMnle`rq_%J|4oJ?_cQ3hl@&`+EJV1acfoyiv)_D8DSLErmvIq>N;sHs8 z>vUDp91s)PqB0TFmOsABHq zcRqW-GOuVB`o2da5KZ)5L6dTJ?-Q&UaBH{QZ5%Ok)>cWP{0F#pa619RFbewUCg)KAn{| zi8u(8%3JUj1VOMD5e6G$5MjIr>wuML5u2pQB$;#eK6`&ZYgx=KJUsIC{g2(&1vK!% zrw{n|@>fn`pgU}0U@nE$9e3y6qpx^+@dF}4L5L|6r8U;lsDEmhJ5zV|%Mt5F2ueUW znlX&0OoxemGkR;}6sfflTkqr)S*lS=A&XEE#vx%2IR&&C(L3|;NU4>aBJR!*Bl6RC z-?*Fe^6H9l91#%|07pZ_dPh{54imfEwAUr$H&%ZiH7%qeunm@piG-kn45q~386LN{Ckt`KuX z#}wFZ61O%P$BDpkU8!c|7|VpTYhp^c8Lb=d z-2a4H3VGNNg0L=FN5K7XN@a}t#2y|EZX5k!Q$U!3#j z#gCX7DFmLyK)jk3%$&Iy`|CY(Gis@{0Hr&%8zQh92F#32iX4`eV{4do6gN^(P$#8C zRAoCP(7@V_>fi{k)xawIBlS&bk&v1b1gy3)|h6 z-Z~nTvVRudy1gU*{rh9C4--pwj;(`r1UMZsAAa_bzyA1*wHei%AYkrnPe+0X?|yzp zeDP+_ekmx>+%b2e2<5oo4r?@L@k}B>F2&#$*25k!=rdSkFGh1x4QXO{U0Dx?rO-EAqQ&?IZa+^J5e->%9u(C=KL_tK-8Jl4Ay?gFCckjK{vUsnY)f`O5l&{{p?d!5I4Ffms zeaIg_{m9|e2|-99fIBG!lE9tMzvRy!9wGvZI-6l2wOUa#PJg|znE-z`V5kn-UNEAW7{o*rk zt+SgZhM`bm;&_}n-|s19;CP$~AyQJJY(~0vO3s)&wRPnF%^N=DLPbW>U^q#(Th z!AGP;jjo0-EB)Gq+KsdAaE+_{x2%L9V1~QX>Ov2~<>5fsj05IQiHWgf+##nx61f`I zo$XMVQX=4F5xOY?gb+yQZ@$C2thm514!j&AF)n9@oY`!*oIm)K-a3xpc6IZMivy>6 bqP5Qd@S%cP;Q!Ak00000NkvXXu0mjfmq}0t delta 683 zcmV;c0#yC<1?mNmOMi+cAt1a$uo49WqN0T_g^m6O3kfJTijBmO+>dk4K6~%AES`}03&tFC%7<^f z=53i7QsRXh@AA`UpYrfHlR_YfFqc9f1327x{{w#g>I+nbihq#0o+!1jtQ7zRiUA_5 zt0dpsWz^H_oGbfW$ki|)rHBHef*73j0W|{^nm788Xtg2tF77(O;c&zSj{6h4 zXSPh!ggJ;CDMiM!4M7DnL;kOLe*HS}ugh-%DSQ={Bt+~!ufVYaU%sq z)EUNsvl!{4VkVe5E>O&=fHkK!V=jif1M<|tykxq*BQFc{H1RY-*L66s*>17c2r)2E zGn=!K_<#5P?>Oa*N#Nm}*#tN(g~Ph?`t3XXe)%n!({MT!6sPqgwHdG6e24gWtypaw z^Td)X2fy-hz8wK*X3TlT1*!@Plw1iaENdnX!@zOPTpN1Elz5yAZce9q^#u{S6iEWD zHOw3X0#{SYy^FiPEGwlIx~>B=P^C|a&2C4|nIyWdm_u1Js>*)92VlFq#(xg;Y>oH| Rm?r=L002ovPDHLkV1h#HMu-3a diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png index da1056c024b266b0739cdb5f7b788593da153c14..68f5af520dcaf1f051b6f7646809851f0d74f02f 100644 GIT binary patch delta 675 zcmV;U0$ly{1>yyeOMik%L_t(I%Po<+iljvpfWLFMROx`0!hW~s z)*Ww7N=~X36M>{k4XCwIPzFt;q715}BzVBm8;9eFcxP2IQ)?tub2JxD2mDmMS|8_A64&FS6|Q2+wCzWJ1=-+#w(sSGKx zoh#Xlby8L)s``cf1=^o z^MW2nY(Fj3Pt!ThBb!Nm7Fs{goU+OWAGw)XHmdu;~cHB2#%^sa2EOY zt1tCv&774a729AsD#v!6&#FNa0q9Lpl>MCPA{aVF zEyfwFw;0t90s@FJ1Y^mqVywYihgbm>oU@23AWW^{tfAG0d+GLj9FNEIHK3%zVmY9_ zQ(NQ3*WV=N%;_{?g#UH@`ZcVxxW6CVV;eJ5ZM^)(TYvm||1Q=Db7`n5OYblOyOg=S z^C5r!^dqGd<{|KVskrTFW|taWmDAybitu#GG*w1t+06-nU@b!!5QJ1aTTKXH(2lbL z2Es59Q)U?)Rs?+p(g0mM^E5NpiVu$7&phPoFFw;4CrYh2?*t5im8o_90fG^hs}-$x zUcLPeZeJRuHFnd?lq&)R?`XBM*{pE_u@u^~7q$j^IADx0=ZqPK0e42g!daHV17Jn) z-eVAgcZ|+52x#wgJ?{pL_t(I%O%pwiXBxHfZ>0wy=qt0Ieif{L=b`_L4v3l6+BjWS}!A`UXB&1ZgFiICbVMY0#+M?Ma_HwJ&Qq$TNJOJh*c^Qm+g{=H}f`IRE7* z!kr#44T;to)q|xuuiyWar@#Kpl!PUMJd9W^h2~C;iXzky%741D*3N$-XnL+_|4(Ve7lv2^sWXFS^%jimBl4)ZS=4s1YPfBwjoa5%QpH z=b3RxBnd=dP(gnD{<~O~g=INVN@X)o{CjytZH;-J*vu2B$0zKruTg}E;N+!KdaX?J zgnawn?SH7fQhFfCh*r2b6o!;|?fsAV^S8&SJD~}HoRoRHWf0+wFTTY7URDgpdncvF zS{v@p(w+6Na=EM=4T(_&5W07EyB*uX*e`qRWHWQvUo#HIJQy*Klpd(Ut2bWZYBM43 zBoUGb1UP~Kt#$0y-FqCCf|`(XMkA1vm~zH}cP793nqC`$U`a7c)LN;n5dr@L80Bs8 ThdF{P00000NkvXXu0mjfI5tV- delta 695 zcmV;o0!aPr1@;AyOMjM0L_t(I%Pr8qizHPPhT->|d#kE@riYnrVNHw_O$p@Lj!X$(8OTZW!s+V>b_O?$2kUV^u5^!k9>UV zRc})Q4LtMqZT`A{k0B_{VG#p|oT<&(<;n}U@9_Kg-*VbTGJitsdZN_Alq*dQbK|-g z`|S=lM^zAn<sc5Vx*LaK(ESNE43NTjm=@gYGJe4l5!?? z0duF10r~usk9^#XOw+{ri8TO01pp0^)ya|v4WY3G&9gZ!07~DzWY8gn9*vbS|gj`KoI3vV9jxyDHmLX zXoiV`3b__E)d~XDpdvU*wMIpl(?kJEgDwUXM@6V+s0t+);47>D5bDip3ubrIQv6FMF>%m4_|uTb8Ey9d4KNKn>_sGCln~=SZlZl?$8J2 z#XFb$`qdZ5quS_WB-UCv?IN=|Q6p1nC~!4r%mD}0<6d1|^EhQLhK}5fK00wVL`0M( z4N+lpm~nSjiykvWRF5(mz##;|a1JUTVm3QCck00-`xgHs-z{JN4t?_7dRVw zT!gtA0(7zCd@=BNx5v%t{?~L-f(Y(@G?=DLX)uMp@4*aI8M+Qb$a$vbf;qHWh+V{* d9ih+8_zxezjr`~C+y4Ln002ovPDHLkV1jn3M_K>? diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png index f9196e707fce5a9d5c3a23bf6478b3fc824fb219..8b6ab7edb2e7a9e7a6ffd1c45adf6cfaf59bdf83 100644 GIT binary patch delta 671 zcmV;Q0$}~;1>OaaOMiYzL_t(I%Po<+s$EqSK*yYOt+gNLL~h`r$V+1QxC4Pt8}Xdxt6$W6}K&$Z^XxcPy>U<~=@y?3M4MoEc#A3o;a->(4h zfMkNVMr}b7xO@487gtXS01*y-Pnwq%5k;iowNeA-Z6_j75q}cU2xRCHpuVB^Noear zI`)})b4-z z7zW0nC#A$t3iGnk_Z^lK^7VuJA>o+FjRjz;oVQB<;33POf6%F63a71NW{jqo!tF;N zk-RmMDSLCa=6@hUjYjpL^B`K#)S1`DR2#nTY$bDdD7-qINSzARg8&?%Iq=5f&c$v1 zG2y)Ic)+nF#!~PIT!f)y(!(#mqSZ!((>!=}{hF>Xs0gQN=HC04m?cydZw(P>?yTDm zBBZ~5`I%*J^f~eN2OsnI^JlEhId%n;08xrSNyeSaPk;FDw`c6Nky7~qSU|ey3)R6?Zq|qp277Ht1PBZz)0fQ9brco4 zoLJVKloRsP58s8vO~k!9*_6}yOv#yT-x<1&!{NZX?+oL}zHN+s&pb^W#*y^m>M8Dx zK+&98mwyQr!OVE)@>5J-FiwW~yDQ0wLs0w3B49U24Jks1bbcJGu0TIDz+X(lY3-_OV z#_2TS0?WLBJE$`DJ=Gf*j~-*Hxg delta 680 zcmV;Z0$2Us1?L5jOMiz+L_t(I%T1HJs$EqShQBf9Tyw2;cFx{Wh=mbB>{6sntq3+k zK%yeV_pq|DOqIeXkW+{#8X{u4fDd35NTc8lo5bL8-R5Nsi+xc4`Y-;geE9ke|7)62 z4ZQN&oBaCl0RZNZf@0RF<|KjZ@7?By&(1(VLtr-y#F8^}u78B!Y9iOI&d0sG}=0ZR8xEW|* zoo7lZEbE2}|6+gG^WxR3#9!`z&eJ)w*2cA)xA^|6Pk&jevFkgAsJI+GiwM_l-r}ck zzh>GpONjh#jreq0c`~gu1aHRWlYy}ss55O9940qX2(;P|1UF~#LQ)~(#$oK)%;<-K z7y{LtVonMHQ6UP5D5{Eiqe~rY&Vc@xK`xapCGxtltPB4~>N*T~;mQ@JX=2?rmU-d% z=MKc*zJK|WC-Z_!plYCP3o1g2k(b|iiyt4{1A~h5GaxwHk2Eu0eg8J`S+3;TnDWBf z97Q-uk)<>MnmJ3(xBv(WX!#peVa=Jil*;*9EaMNW2?*m9w O0000 Date: Mon, 10 Jun 2019 12:12:06 +0200 Subject: [PATCH 5/5] Stained clinker added. CTRL-SHIFT tooltips opt-out config added. Recipe conditions updated due to detailed opt-out possibilities. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 5 +++-- 1.12/readme.md | 13 +++++++++++ .../wile/engineersdecor/blocks/ModBlocks.java | 17 +++++++------- .../engineersdecor/detail/ModAuxiliaries.java | 1 + .../wile/engineersdecor/detail/ModConfig.java | 9 +++++++- .../assets/engineersdecor/lang/en_us.lang | 16 ++++++------- .../assets/engineersdecor/lang/ru_ru.lang | 16 ++++++------- .../engineersdecor/recipes/_constants.json | 17 +++++++++++++- .../clinker_brick_block_recipe.json | 0 .../clinker_brick_stained_block_recipe.json | 0 ...er_brick_stained_block_recipe_reverse.json | 16 +++++++++++++ .../clinker_brick_stained_stairs_recipe.json | 3 ++- ...brick_stained_stairs_recipe_decompose.json | 3 ++- .../clinker_brick_stairs_recipe.json | 3 ++- ...clinker_brick_stairs_recipe_decompose.json | 3 ++- .../clinker_brick_wall_recipe.json | 3 ++- .../clinker_brick_wall_recipe_decompose.json | 3 ++- .../{ => brick}/slag_brick_block_recipe.json | 0 .../{ => brick}/slag_brick_stairs_recipe.json | 3 ++- .../slag_brick_stairs_recipe_decompose.json | 3 ++- .../{ => brick}/slag_brick_wall_recipe.json | 3 ++- .../slag_brick_wall_recipe_decompose.json | 3 ++- .../concrete_wall_recipe_ie_required.json | 0 .../panzerglass_block_recipe.json | 0 .../rebar_concrete_block_recipe.json | 0 .../rebar_concrete_stairs_recipe.json | 3 ++- ...ebar_concrete_stairs_recipe_decompose.json | 3 ++- .../rebar_concrete_tile_recipe.json | 3 ++- .../rebar_concrete_tile_recipe_decompose.json | 3 ++- .../rebar_concrete_tile_stairs_recipe.json | 3 ++- ...concrete_tile_stairs_recipe_decompose.json | 3 ++- .../rebar_concrete_wall_recipe.json | 3 ++- .../rebar_concrete_wall_recipe_decompose.json | 3 ++- .../{ => device}/factory_dropper_recipe.json | 0 .../passive_fluid_accumulator_recipe.json | 0 .../small_electrical_furnace_recipe.json | 0 .../small_lab_furnace_recipe.json | 0 .../small_waste_incinerator_recipe.json | 0 .../straight_pipe_valve_recipe.json | 0 ...ght_pipe_valve_redstone_analog_recipe.json | 0 .../straight_pipe_valve_redstone_recipe.json | 0 ..._pipe_valve_redstone_recipe_backcycle.json | 0 .../treated_wood_crafting_table_recipe.json | 0 .../treated_wood_stool_recipe.json | 2 +- .../treated_wood_table_recipe.json | 2 +- .../treated_wood_windowsill_recipe.json | 0 .../metal_rung_ladder_recipe.json | 0 .../{ => ladder}/metal_rung_steps_recipe.json | 0 .../treated_wood_ladder_recipe.json | 0 .../{ => light}/iron_inset_light_recipe.json | 0 .../{ => sign}/sign_danger_recipe.json | 0 .../{ => sign}/sign_defense_recipe.json | 0 .../{ => sign}/sign_factoryarea_recipe.json | 4 ++-- .../{ => sign}/sign_hotwire_recipe.json | 0 .../sign_hotwire_recipe_backcycle.json | 0 .../slab/halfslab_concrete_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_rebar_concrete_recipe.json | 21 ++++++++++++++++++ .../halfslab_sheetmetal_aluminum_recipe.json | 21 ++++++++++++++++++ .../halfslab_sheetmetal_copper_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_sheetmetal_gold_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_sheetmetal_iron_recipe.json | 21 ++++++++++++++++++ .../halfslab_sheetmetal_steel_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_treated_wood_recipe.json | 21 ++++++++++++++++++ .../steel_double_t_support_recipe.json | 0 .../thick_steel_pole_head_recipe.json | 3 ++- .../thick_steel_pole_recipe.json | 0 .../thick_steel_pole_recipe_backcycle.json | 3 ++- .../thin_steel_pole_head_recipe.json | 3 ++- .../{ => support}/thin_steel_pole_recipe.json | 0 .../thin_steel_pole_recipe_backcycle.json | 3 ++- .../treated_wood_pole_head_recipe.json | 3 ++- .../treated_wood_pole_recipe.json | 0 .../treated_wood_pole_support_recipe.json | 3 ++- .../treated_wood_pole_wrapover_recipe.json | 3 ++- .../steel_framed_window_recipe.json | 0 .../treated_wood_window_recipe.json | 0 .../clinker_brick_stained_texture0.png | Bin 737 -> 757 bytes .../clinker_brick_stained_texture1.png | Bin 748 -> 731 bytes .../clinker_brick_stained_texture2.png | Bin 740 -> 750 bytes .../clinker_brick_stained_texture3.png | Bin 738 -> 738 bytes .../clinker_brick_stained_texture4.png | Bin 756 -> 751 bytes .../clinker_brick_stained_texture5.png | Bin 738 -> 739 bytes .../clinker_brick_stained_texture6.png | Bin 748 -> 750 bytes .../clinker_brick_stained_texture7.png | Bin 734 -> 753 bytes 1.13/readme.md | 2 ++ meta/update.json | 5 +++-- 87 files changed, 309 insertions(+), 61 deletions(-) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stained_block_recipe.json (100%) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stained_stairs_recipe.json (74%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stained_stairs_recipe_decompose.json (73%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stairs_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stairs_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_wall_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_wall_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_stairs_recipe.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_stairs_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_wall_recipe.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_wall_recipe_decompose.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/concrete_wall_recipe_ie_required.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/panzerglass_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_stairs_recipe.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_stairs_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_stairs_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_stairs_recipe_decompose.json (74%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_wall_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_wall_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/factory_dropper_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/passive_fluid_accumulator_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/small_electrical_furnace_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/small_lab_furnace_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/small_waste_incinerator_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_redstone_analog_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_redstone_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_redstone_recipe_backcycle.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/treated_wood_crafting_table_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => furniture}/treated_wood_stool_recipe.json (83%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => furniture}/treated_wood_table_recipe.json (84%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => furniture}/treated_wood_windowsill_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => ladder}/metal_rung_ladder_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => ladder}/metal_rung_steps_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => ladder}/treated_wood_ladder_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => light}/iron_inset_light_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_danger_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_defense_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_factoryarea_recipe.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_hotwire_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_hotwire_recipe_backcycle.json (100%) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/steel_double_t_support_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thick_steel_pole_head_recipe.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thick_steel_pole_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thick_steel_pole_recipe_backcycle.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thin_steel_pole_head_recipe.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thin_steel_pole_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thin_steel_pole_recipe_backcycle.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_head_recipe.json (70%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_support_recipe.json (70%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_wrapover_recipe.json (70%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => window}/steel_framed_window_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => window}/treated_wood_window_recipe.json (100%) diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 43126e0..1a40bc4 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-b2 +version_engineersdecor=1.0.8 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 7d4a67f..ba18c8f 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.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).", "1.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.\n[A] Added standalone recipes for signs, factory dropper, and electrical furnace.\n[M] Adapted \"Caution\" sign backgrounds to the yellow defense system warning background.", @@ -42,7 +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." }, "promos": { - "1.12.2-recommended": "1.0.7", - "1.12.2-latest": "1.0.8-b2" + "1.12.2-recommended": "1.0.8", + "1.12.2-latest": "1.0.8" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index c8ed268..a7dd1d6 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,19 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + ------------------------------------------------------------------- + - 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.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). 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 bf05ea3..ff8fe25 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -354,9 +354,17 @@ public class ModBlocks private static final Object content[] = { TREATED_WOOD_CRAFTING_TABLE, TREATED_WOOD_CRAFTING_TABLE_TEI, + SMALL_LAB_FURNACE, SMALL_LAB_FURNACE_TEI, + SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI, + FACTORY_DROPPER, FACTORY_DROPPER_TEI, + SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI, + 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_STAIRS, CLINKER_BRICK_WALL, + CLINKER_BRICK_STAINED_BLOCK, + CLINKER_BRICK_STAINED_STAIRS, SLAG_BRICK_BLOCK, SLAG_BRICK_STAIRS, SLAG_BRICK_WALL, @@ -385,19 +393,10 @@ public class ModBlocks THICK_STEEL_POLE_HEAD, STEEL_DOUBLE_T_SUPPORT, SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_MODLOGO, - SMALL_LAB_FURNACE, SMALL_LAB_FURNACE_TEI, - SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI, - FACTORY_DROPPER, FACTORY_DROPPER_TEI, - SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI, - STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI, - PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI, }; private static final Object dev_content[] = { SIGN_MINDSTEP, - // design not sure yet ... - CLINKER_BRICK_STAINED_BLOCK, - CLINKER_BRICK_STAINED_STAIRS, // handling not sure yet ... HALFSLAB_REBARCONCRETE, HALFSLAB_CONCRETE, diff --git a/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java b/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java index ba97651..3ffc24b 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java @@ -85,6 +85,7 @@ public class ModAuxiliaries { // Note: intentionally not using keybinding here, this must be `control` or `shift`. MC uses lwjgl Keyboard, // so using this also here should be ok. + if(ModConfig.noToolTips()) return false; final boolean help_available = (helpTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".help"); final boolean tip_available = (advancedTooltipTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".tip"); if((!help_available) && (!tip_available)) return false; 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 9b2c77d..03ac8e1 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java @@ -176,6 +176,10 @@ public class ModConfig @Config.Name("Without h. supports") @Config.RequiresMcRestart public boolean without_hsupports = false; + + @Config.Comment({"Disable CTRL-SHIFT item tooltip display."}) + @Config.Name("Without tooltips") + public boolean without_tooltips = false; } @Config.Comment({ @@ -337,6 +341,9 @@ public class ModConfig public static final boolean isWithoutRecipes() { return (zmisc==null) || (zmisc.without_recipes); } + public static boolean noToolTips() + { return optout.without_tooltips; } + public static final boolean isOptedOut(final @Nullable Block block) { return isOptedOut(block, false); } @@ -382,7 +389,7 @@ public class ModConfig if(optout.without_walls && (block instanceof BlockDecorWall)) return true; if(optout.without_poles && (block instanceof BlockDecorStraightPole)) return true; // String matching based evaluation - if(optout.without_clinker_bricks && (rn.startsWith("clinker_brick_")) || (rn.startsWith("clinker_brick_stained_"))) return true; + if(optout.without_clinker_bricks && (rn.startsWith("clinker_brick_"))) return true; if(optout.without_slag_bricks && rn.startsWith("slag_brick_")) return true; if(optout.without_rebar_concrete && rn.startsWith("rebar_concrete")) return true; if(optout.without_ie_concrete_wall && rn.startsWith("concrete_wall")) return true; 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 3142729..9585494 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 @@ -147,21 +147,21 @@ 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.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_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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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. #----------------------------------------------------------------------------------------------------------- # 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 56747df..cd8bc77 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 @@ -140,21 +140,21 @@ 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.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_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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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. #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- 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 9720d11..8816856 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -76,9 +76,17 @@ "name": "slabSheetmetalSteel" }, { - "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminium" }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminum" }, "name": "slabSheetmetalAluminium" }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalCopper" }, + "name": "slabSheetmetalCopper" + }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalGold" }, + "name": "slabSheetmetalGold" + }, { "ingredient": { "type": "forge:ore_dict", "ore": "sand" }, "name": "sand" @@ -220,6 +228,13 @@ "ingredient": { "item": "immersiveengineering:stone_decoration", "data": 5 }, "name": "blockConcreteIe" }, + { + "conditions": [ + { "type": "minecraft:item_exists", "item": "immersiveengineering:stone_decoration" } + ], + "ingredient": { "item": "immersiveengineering:stone_decoration_slab", "data": 5 }, + "name": "slabConcreteIe" + }, { "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:wooden_device0" } diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json new file mode 100644 index 0000000..4b32075 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json @@ -0,0 +1,16 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "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.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe.json similarity index 74% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe.json index ec80be6..8356699 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stained_stairs" + "result": "engineersdecor:clinker_brick_stained_stairs", + "required": ["engineersdecor:clinker_brick_stained_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe_decompose.json similarity index 73% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe_decompose.json index 11d939e..bd69ba0 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stained_block" + "result": "engineersdecor:clinker_brick_stained_block", + "required": ["engineersdecor:clinker_brick_stained_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe.json index 17125d4..0a865a8 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stairs" + "result": "engineersdecor:clinker_brick_stairs", + "required": ["engineersdecor:clinker_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe_decompose.json index 6d8ceab..9d38290 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe.json index 6a3be11..32162b2 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_wall" + "result": "engineersdecor:clinker_brick_wall", + "required": ["engineersdecor:clinker_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe_decompose.json index d146f3c..4e41df8 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_wall"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe.json index 7f1019e..2af1f2a 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_stairs" + "result": "engineersdecor:slag_brick_stairs", + "required": ["engineersdecor:slag_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe_decompose.json index 7c8f171..f2d92b7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_block" + "result": "engineersdecor:slag_brick_block", + "required": ["engineersdecor:slag_brick_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe.json index a140b2a..7fc4f0e 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_wall" + "result": "engineersdecor:slag_brick_wall", + "required": ["engineersdecor:slag_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe_decompose.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe_decompose.json index db1b40d..bd12d3e 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_block" + "result": "engineersdecor:slag_brick_block", + "required": ["engineersdecor:slag_brick_wall"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/concrete_wall_recipe_ie_required.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/concrete_wall_recipe_ie_required.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/panzerglass_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/panzerglass_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/panzerglass_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/panzerglass_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe.json index fc4f8c8..ee01dd4 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_stairs" + "result": "engineersdecor:rebar_concrete_stairs", + "required": ["engineersdecor:rebar_concrete"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe_decompose.json index 13718e7..87388e7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe.json index 4eb6034..de264d6 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_tile" + "result": "engineersdecor:rebar_concrete_tile", + "required": ["engineersdecor:rebar_concrete"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe_decompose.json index 5635ec7..f7a42cc 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_tile"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe.json index e3da4f1..b5b867e 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_tile_stairs" + "result": "engineersdecor:rebar_concrete_tile_stairs", + "required": ["engineersdecor:rebar_concrete_tile"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe_decompose.json similarity index 74% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe_decompose.json index fb6666e..86205f2 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_tile" + "result": "engineersdecor:rebar_concrete_tile", + "required": ["engineersdecor:rebar_concrete_tile_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe.json index 61baf76..f9cf388 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_wall" + "result": "engineersdecor:rebar_concrete_wall", + "required": ["engineersdecor:rebar_concrete"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe_decompose.json index cb12d06..5c003a8 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_wall"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/factory_dropper_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/factory_dropper_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/factory_dropper_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/factory_dropper_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/passive_fluid_accumulator_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/passive_fluid_accumulator_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/passive_fluid_accumulator_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/passive_fluid_accumulator_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/small_electrical_furnace_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_electrical_furnace_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/small_lab_furnace_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_lab_furnace_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_waste_incinerator_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/small_waste_incinerator_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_waste_incinerator_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_waste_incinerator_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_analog_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_analog_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_analog_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_analog_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe_backcycle.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe_backcycle.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/treated_wood_crafting_table_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/treated_wood_crafting_table_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_stool_recipe.json similarity index 83% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_stool_recipe.json index 85cdeb1..8d24c1b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_stool_recipe.json @@ -3,7 +3,7 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:treated_wood_stool", - "required": ["immersiveengineering:material"] + "required": ["immersiveengineering:material", "engineersdecor:treated_wood_pole"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_table_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_table_recipe.json similarity index 84% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_table_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_table_recipe.json index ad942dd..b736495 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_table_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_table_recipe.json @@ -3,7 +3,7 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:treated_wood_table", - "required": ["immersiveengineering:material"] + "required": ["immersiveengineering:material", "engineersdecor:treated_wood_pole"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_windowsill_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_windowsill_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_ladder_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_ladder_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_steps_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_steps_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_steps_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_steps_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/ladder/treated_wood_ladder_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/ladder/treated_wood_ladder_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/light/iron_inset_light_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/light/iron_inset_light_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_danger_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_danger_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_danger_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_danger_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_defense_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_defense_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_defense_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_defense_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_factoryarea_recipe.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_factoryarea_recipe.json index 6dfecd4..42096da 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_factoryarea_recipe.json @@ -2,8 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:sign_defense", - "required": ["engineersdecor:sign_danger"] + "result": "engineersdecor:sign_factoryarea", + "required": ["engineersdecor:sign_defense"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe_backcycle.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe_backcycle.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json new file mode 100644 index 0000000..4f61115 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_concrete", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabConcreteIe" } + }, + "result": { + "item": "engineersdecor:halfslab_concrete", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json new file mode 100644 index 0000000..3adaacb --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_rebar_concrete", + "required": ["engineersdecor:rebar_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "S", + "S" + ], + "key": { + "S": { "item": "engineersdecor:rebar_concrete" } + }, + "result": { + "item": "engineersdecor:halfslab_rebar_concrete", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json new file mode 100644 index 0000000..0d59738 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_aluminum", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalAluminium" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_aluminum", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json new file mode 100644 index 0000000..6e6d180 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_copper", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalCopper" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_copper", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json new file mode 100644 index 0000000..4974a4d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_gold", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalGold" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_gold", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json new file mode 100644 index 0000000..69f9288 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_iron", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalIron" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_iron", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json new file mode 100644 index 0000000..817857e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_steel", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalSteel" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_steel", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json new file mode 100644 index 0000000..865a4fa --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_treated_wood", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabTreatedWood" } + }, + "result": { + "item": "engineersdecor:halfslab_treated_wood", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/steel_double_t_support_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/steel_double_t_support_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_head_recipe.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_head_recipe.json index e2efd5d..86ed2eb 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_head_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thick_steel_pole_head" + "result": "engineersdecor:thick_steel_pole_head", + "required": ["engineersdecor:thick_steel_pole"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe_backcycle.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe_backcycle.json index 8d4bc27..2319260 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe_backcycle.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thick_steel_pole" + "result": "engineersdecor:thick_steel_pole", + "required": ["engineersdecor:thick_steel_pole_head"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_head_recipe.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_head_recipe.json index 88613a9..09e7f1b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_head_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thin_steel_pole_head" + "result": "engineersdecor:thin_steel_pole_head", + "required": ["engineersdecor:thin_steel_pole"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe_backcycle.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe_backcycle.json index 9623469..306fb28 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe_backcycle.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thin_steel_pole" + "result": "engineersdecor:thin_steel_pole", + "required": ["engineersdecor:thin_steel_pole_head"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_head_recipe.json similarity index 70% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_head_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_head_recipe.json index 9fc7e3d..735e3d7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_head_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_head_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole_head" + "result": "engineersdecor:treated_wood_pole_head", + "required": ["engineersdecor:treated_wood_pole"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_support_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_support_recipe.json similarity index 70% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_support_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_support_recipe.json index 4be9e98..08ed0b9 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_support_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_support_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole_support" + "result": "engineersdecor:treated_wood_pole_support", + "required": ["engineersdecor:treated_wood_pole_head"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_wrapover_recipe.json similarity index 70% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_wrapover_recipe.json index 4f326b8..7942d20 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_wrapover_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole" + "result": "engineersdecor:treated_wood_pole", + "required": ["engineersdecor:treated_wood_pole_support"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/steel_framed_window_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/window/steel_framed_window_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/steel_framed_window_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/window/steel_framed_window_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_window_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/window/treated_wood_window_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_window_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/window/treated_wood_window_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png index 25fac1a422b9b8e1a4865288741d1ee05c2cc283..0e3f2b7745102fd38ca3349e1436c520ef9ca6a2 100644 GIT binary patch delta 694 zcmV;n0!jVh1@#4xOMjI~L_t(I%O%lIid)k$~T5_jOl4G4k*wMRV= z6`Z&XLBt?}BL_~zt!Qvy0zm{x_8=sR6YcKmu736E-FweD4zh*slZWrW9d?*m4?Sn^ zU2ys2CvNA3K-ez@bH_YT5#IXfQ~rDWGa^Dk$X!QPt4yU~1b@fjT+a*595=@zSob|s ztr&`^aNQg+W8G!k9c^Z4Ql{$M?(UeDO07mjaBt`-b;jo%8+9(XH;5Y~#R>YHkRQMO zI!dWDYYgK^0P}uNR;5L7^Uq(b#u3-daPk^%jZT&IX2X6zlmC74i2brKEe#K+*MtEU z&KvKZ^WxbbxPKWD2rQr{6~Ow)uptj3-Pr>6vgxihXeakarDkPFCIT4BUl7iIUxkP z+Hi9yoPGE)`KC6aHB^kb98eJemZfk6D6l&$AmE-*KpsdOMih$L_t(I%PrGOYn@dTfZ=zoz4v!HCzl!&oheESrLBRYr~?&o zUMM*A_jY2Tqc~_Ch?5{8X-;y^ciDTb<)Hq97am@D`Sf8VtDKGl>G3)3&o}I*g)Sv( zGb|kUz&!Z;r(byg$1AEk6(K~?UV^nbcgsRbncAEHZs(Qz+JA^pS_GuTI1Ehg?AHeF zM62X###l0a&X^l+j)tN*A&{k!e5I5Db7!MMHxvL=l*|{82vv^G&bYj~Vtn)jSyyyk zNUGR!V7nO^H(T!ad*tC$ioogdF|{>v_s=^D@bB9O;oOB#!;yf`zWI)u*B4A4R8^We z~@GKVU4gxmIx+m2*Sag zq6t+n6bT4(77ubt6dVr_YluL}nSA>7bNW(HRdUL#%SsTK86f2I=ST=kt$g(0got1m z1`dabsWq~^yWsXPkwtj${g2#Tydi+*fe^HSK^0Y@e1G}_*RNl(4@Xr$h|RT;x}IiE zNdoysvC4&VKa{W2Os=`56Q-gH~;_u07*qo IM6N<$f@T&#BLDyZ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png index 6d7324ffd12fe192f2127b70c0479f78999a83d1..b581cc05a956ac2e301a2f0946d580c106c94446 100644 GIT binary patch delta 668 zcmV;N0%QH`1=|IXOMiPwL_t(I%SDpCs$^9VMpxC|=XCen?w-W^0+X1C2Et%!qKO6u zA|i~4_y7ZfkszXpsfmf0h>D;nOyVS_zQH7-AcBDiS3ReD|5cSi2S#7|t;Ldep1m9G zeCF0>;?4^%^UH&;0kDA9jika-8WF+W*WTdKH(wwkG$7}Rtbf)S-DpX;efx-N;$}V5 zx}ix(2nghPOUgr!8C*)sugSmt@I9p&r!lzm{EPhh<3l2XNq-b~BdIdX*=FULdvEgdw_mc9 z%6^{ty$|xusSp9?aanUD;6$f&W0w;U)aJC-S!>7LS$ju-OaxO(3Q7nN18tgksK;vRPsE}%mNz~x?jRk0=FRNg!O^Aqky{u&;do5=Lz}rqYt8# zhWTLLY``5<*-R5ILPTJ#;{i50s*1ZaO_}}S$Q6I-e1?GZG;Kow0000L_t(I%RQ4ji(XX}K-b>qoO{35%*4^Cjh&<$As9raun+`` z6ek9xTnco_}T{pw>WCh*CJ&?^(>4 zs*wn2l{~F0XMIm~I1Wb$p-+VYFwYC-&ZcBUpwAik=JQYE_49Mqb!BZv zR%MwcJc4_#p0iF9&77`e_WJ`8&T$;s^gWyHhCKaz#dCpbMiQYbh0%i~!u=0F;*YEE zSCkMK&u-$C1 zW>hokvas828K#Ms*GIOe2lDvrDc9x%aC-5Oe}4astbfXlKo&@<;Et+t|KWQKzh3e8 zFcCmf$Tw@H(}b#`k{FhiUCET3n3|Kg3utECjw4cyh@ex5fV|6z)q?A3qKqS1g`0UH zsosG}Ig3OK=(>*Ed8Q91NyY-?yRW{8WnCG@33Eq9=u1IWxfupFeNQe0H)Frw^UBGA z&2~#l%71aVCBJy~6B5qcoY9;fqa|fq3U6FI;`xtHaC00uYzlumOrqHBz=Ox1kZUtE zoQ!j-P+jPA!4dkBDa|l~-kq1Xm4?uTGpvnLGC7xwx5_>h%!4ihiNHK4rMsKP9VKvg zGO&73R1s0~Tkl_TydKc3bX|wHhN#k&Lci^K`zGVZSZnMK2izKFhN@C)g@FG6I9Phm T(T;bh00000NkvXXu0mjfdB#j! diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png index 82ca51b0f1283130f89b8dbe4e6e7f04bbb50f78..9270c7bcb8bed14407172290d6cd443bcd67dc76 100644 GIT binary patch delta 687 zcmV;g0#NO=wq!tX=ScqV!V5QYX zkz5i|TKEyt2L;hjV4;QBh>#Fe5-j`#cD6#WFa(5{b8^qj>^*y}WpTd2%k%!^?)&d} zooCFQH$S<}UqAoEzb_|Z2m}#A5KNsuN8b48lD~hskBCr#oPQFjb7g7`7hxDj4yA!Z zYYGAaEM`>MVD9W|Ma%){h7F;qGIky6u#|maA2wKPNC;rYxZ6?YnYON&Lr$6W&*O)*)>z6)Q6)%Vb;sO! z>+%jyetp2PHh<=|;W!`+DYES|uU}k}4#%07b)^e|+7uThNnpqcbLTLxC`KQINu7u> z$&)eLutIe|IVl({y#m>BwmnUPZ<)J7Kr&5TW#a5vJ8k8g3DXG8>dXIU!4 zu;DmOG*@2x@B+*TDWR>==Zxd18JkT{diwYQ&yN*z*0nK}dV+*ILyoMb z3`0*-qnd$35{N-CKm~$C+>9cgmJfHjFGo*-61_Y zPN0gq%k2q(C5s!+bB{>LF>uBww2AMXITo4bAJ9R{{xS< Vg&Z}3=4$`|002ovPDHLkV1l)SMi~GA delta 677 zcmV;W0$Tm<1>^;gOMiq(L_t(I%Po`3idqoLg0?N_Q6oA1$I2ok$EKW?;ZU z6yNv_et?5aoICTA#6S`U5`>@=KS0C~L}MqNu6yg=d(Ph5LFEtDVzK1w_pSzYrkZp0 zi?4Wi?>0~S0aVE%csL$HR^|1ZAM?lE+aOR8mN}Di7(+9LT7Nm;^$fKELYPwpRD>Wf zRa$M#Ze)aJ&g@Q(2m+WKtXBT(M+7KI=|nJ96vfQ2*2pOl0pURlkne7N6Z1UN4|^6} zhpJ+&()RbAbzF=iT~g+0rkT-NBmZ;%Cxqa9Khs;#%t2t46Ib4Tm&d>V z%Ae+hHB^KyC4Ug5D~Z=`+$0avOl`(Kpcx>72#mE+TVQfR0|@4)Av8%uRA|r9)Fwx%^VRS3An?nAAQ23J3lg1 z<8qgIlry=XDj;|S?t!$1Szyoex(Dj<}c`0ayS5 zqF@ntz-qB%vPwybE-4_$_ut+MMCkW>j*gERb~`S1JHmscN+}t6PMC6LyFKCQ`7??N zr4;htKY!n4oGUJghY_SUv0W{ZoT+bKyyeQ-6=mid{t%M%Ug|b`kty?dpqc?`L{lnd~xgDI3AB|$AMRF-RAPq0|0u! zloQWuB^;VNZ=HY4A3uD90}Wv)g>1Fr=FHkCx{%GBxkTT5*5~T!JKuBt;?+fh#j|Qo^15#+?glYmCD{MDXPDU!1_KvDvJ7^}Y9za6}U? zzqDh>nNl*{9ZgF9`{(bOmrm`Sv%8=2__v2NcNC$T5q~1Al7a}Yee?;xfA=-vPDu$w z(5J@*>mBP(c(BdN7(tHClmzJ=YsSbmSrhKTu^HAoN(2aWaZ*l*C^x5(^-$1&4mj}N z(zu!zQW9=#CrVOE%EW`uwu9INAtVG)=)I;0E&OYc;>ekZ^Ka!!Z{V<{9(XawFJ0R~lqAisHj z!Rb_SH&6w4oa+$^uYYh(uMH3A)=*VyYs3rL{}hjTgb-_N9^e1~002ovPDHLkV1j`W BM2i3b delta 667 zcmV;M0%ZN-1>yyeQ-6~^i(OR|K-b>qocrL#$T}3DwaI@_`|rFCKTcF+wXY(_!nMI2l`UT zB6v6+LRRJO=U;O5_%{%!2t&?fS|!|>&A6EktmgD76XsL_6@MWJOqJG*)s2kM%vs&Z zb8D;)E(vRmmxmJql%#Ybm@0~5X1EzSB_bd^XaVxW!|x-fguCMrbfrThSeAux90+&L zFD@9mj{WI`gj1K5W=3sBKK%8RZBFc$%E5wW4gzCNTzqiJzt8^UA9KPQDngeMh|-nB z=Dm-|^Ri-9nSTSC0V0UNsW#TyI4zADhDNaKGDJ{v!UN`YArCoG12#!GX^;bIKoy}c z1xdnI3PTo}8DmMT))@Ojzul0x@84rH4s6De{WReY5WMxq>r{7Md-WRxp*ADJ*=$D+ z(~)^T5hCRJ_cN}|Ng}**|5IN4{wwCe3lEw*S(PN<4u5Zc@ikXJ|HQExV^%g@M?S2T zEJ_PUG+}FHu|Na>*5;HXG!KsR%=tJ{{m5L6q!kqckHEv&-PtiWBdK5k1c-t~-~nUb zvsfjk#8?s_$d8X6#%35uC3ENOjN>%1pC-bCq)I6nLH>up`NbK><4n<8#eDtr34;on zGFK6#wtsLj4oJ?_cQ3hl@&`+EJV1acfoyiv)_D8DSLErmvIq>N;sHs8>vUDp91s)PqB0TFmOsABHqcRqW-GOuVB z`o2da5KZ)5L6dTJ?-Q&UaBH{QZ83A!R!O4#2Nbw=a619RFbeN@A_z1La>m49#Y@yJJSyc%_$ z*^WJT-+GTt4JAV$O5o0wc+!&^T)dNA8 zYs1{>L|9uxL|MwpVJ)~hM9|h1ZDvTP{I?p1nd;RA}ps9BEtS+kGF=XQrE(?+p#V)3V1+Hne^o9F=QY4$XB0#8nrbp9{C-295`USIj!R)~POn0E(A?=9W^V+7yE7&w0i{+1_~&*efai7- zN(5t43}?UJk+cH^fF2MPj@3AtW7S!jaZ`E3

5e->%9u(C=KL_tK-8Jl4Ay?gFCckjK{vUsnY)f`O5l&{{p?d!5I4Ffms zeaIg_{m9|e2|-99fIBG!lE9tMzvRy!9wGvZI-6l2wOUa#PJg|znE-z`V5kn-UNEAW7{o*rk zt+SgZhM`bm;&_}n-|s19;CP$~AyQJJY(~0vO3s)&wRPnF%^N=DLPbW>U^q#(Th z!AGP;jjo0-EB)Gq+KsdAaE+_{x2%L9V1~QX>Ov2~<>5fsj05IQiHWgf+##nx61f`I zo$XMVQX=4F5xOY?gb+yQZ@$C2thm514!j&AF)n9@oY`!*oIm)K-a3xpc6IZMivy>6 bqP5Qd@S%cP;Q!Ak00000NkvXXu0mjfq|#6e diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png index 68f5af520dcaf1f051b6f7646809851f0d74f02f..95b7a51869655049467faa0d3a58cea86f10e11d 100644 GIT binary patch delta 676 zcmV;V0$cs!1>*&fOMin&L_t(I%Qca)iX}x9K+nB(tGeH`>lhlU2#UdCU??Ug3#;zx zGK=U>mdP7fg`Ap$fjQ&JKg%SH+(7o)oKT+YbXUw$5a zcS^~q8NEC6%{3yzG)*KGhB7eEGj~o;+17=G&?Cr}v1b=g*juCTj)$}MV6ep2J8wSv znBRZ+76OVXbARiUY*;{6c;nHhnD$O>9aW+2feNg<69HRm^bS)I=Gv$p;C^c=0xGD7 zgFyE{lA@ZZzT>LoWQfAtoNUIF6cM3%$C486*sJfKAu24}#(Z4awvBNZNJ&A3yARJe z9*^{Zt!|tQ10K#e3}{m9>63Go+FACUm+n2_xAX5&6@S*+$qLzwB*OK!@%H0SczW?O zwKfhpLj-ntTpDVgi5YhHN% z4)*uO6MrsooWx%@Gu|qKfGT$%obl%`KY|AcY`bF$UPgKkUcCPScGY$UoXh!!V{Hg< zQjEFnx668GtBn8yyeOMik%L_t(I%Po<+iljvpfWLFMROx`0!hW~s z)*Ww7N=~X36M>{k4XCwIPzFt;q715}BzVBm8;9eFcxP2IQ)?tub2JxD2mDmMS|8_A64&FS6|Q2+wCzWJ1=-+#w(sSGKx zoh#Xlby8L)s``cf1=^o z^MW2nY(Fj3P)=sdqGME_5Oqe_GJ@=fwx5b-Zu-1CkTJqW3x5Czy z-B@_}o%i|Ymj{@G12wuPa5q~|ni-@oxpoy&3sDIs9RnU}BO+3DMPIw?H zD8e{o#@#hqZ|pt5Iw>Wh8%hLY$y5u>3^zv+_N}vZ!^7FvjlmlLIh=XSI6=t?x%2fG z5gv3idITkBhNKLou+)n8j;PXGW0+>foan8wZjA`YfB$r!t6HhsL2XQlrF9^<^~tCF ze(!s#8FR^)JAaxoqd<4(joTlSd+S`)PVI(7uy!Mh;=t9qLco{=dEsz~hNXl>fCw7l zy;OWJJ6PO>?cXa(aX2F{uoRKeDCwgb8 zDL_t(I%O%pwiXBxHfZ>0wy=qt0Ieif{L=b`_L4v3l6+BjWS}!A`UXB&1ZgFiICbVMY0#+M?Ma_HwJ&Qq$TNJOJh*c^Qm+g{=H}f`IRE7* z!kr#44T;to)q|xuuiyWar@#Kpl!PUMJd9W^h2~C;iXzky%741D*3N$-XnL+_|4(Ve7lv2^sWXFS^%jimBl4)ZS=4s1YPfBwjoa5%QpH z=b3RxBnd=dP(gnD{<~O~g=INVN@X)o{CjytZH;-J*vu2B$0zKruTg}E;N+!KdaX?J zgnawn?SH7fQhFfCh*r2b6o!;|?fsAV^S8&SJD~}HoRoRHWf0+wFTTY7URDgpdncvF zS{v@p(w+6Na=EM=4T(_&5W07EyB*uX*e`qRWHWQvUo#HIJQy*Klpd(Ut2bWZYBM43 zBoUGb1UP~Kt#$0y-FqCCf|`(XMkA1vm~zH}cP793nqC`$U`a7c)LN;n5dr@L80Bs8 ThdF{P00000NkvXXu0mjfBF;(N diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png index 8b6ab7edb2e7a9e7a6ffd1c45adf6cfaf59bdf83..af4dff35a27265a90a104d13e060c9e9a4b9d4f8 100644 GIT binary patch delta 690 zcmV;j0!{ti1@Q%tOMj6`L_t(I%SDsBie^O=M%S*|r_Slq_sl>8F)=XJSQ9}6Z4?nq z36}#?k46=w!ul7$hFc99Ouc`Ugzg8KSxB^4_Hz{Ykw(})=3)BY2to2a;da# z>`NsgfTPPwE`{UHBIyZIw_}<5^Nw-WH=;^xPvpuIb*GJyiDY7Xo$$i z@4fAlDs!4x))f&U?{^x-6p)NVZe z#+&?d;|oeR)_FhWQ|fkbB1+_Ibn1890~sGFP>t2&$2@ zbs^0OZQZD25ClMw|D-uWKnPK|`%l4qa5^WB=fq|Mje%Ax^67`~x|xxtL}``0-&og` z+A5k7DnbOhJ5m0}=TbO5J465c@fNulL7c~4c!i(7`G1PijiWg+ML|Pk(SV5X$n!7p z*Z1F2YQqrzFhlR|Hukj>MaX&M_#iPgBSqn=G?rl8+Xg`b54BDZq4Z95ST&+5aIz%2 z4-ml#Bn5HjNEL~~ii%geu+=Lx;@!)@G+7?c_Uwq>ReIG86Me)fXjZhsBKK?K~<0AV?#w9XS3 zFQeIv(L1egm^&JTkS4D327rxm{fQtrf(nFoMH|jmDxnQ$S1SieSyVZh7pggZK(}jY z=LZWZMig*!av$)Zmd`$V->>fPsI4-kga)Cs&MUgioSvUE%&>ahzV${oV~m0093P+X YFHwJa6@zMJ9smFU07*qoM6N<$f=il8egFUf delta 671 zcmV;Q0$}~|1>OaaOMiYzL_t(I%Po<+s$EqSK*yYOt+gNLL~h`r$V+1QxC4Pt8}Xdxt6$W6}K&$Z^XxcPy>U<~=@y?3M4MoEc#A3o;a->(4h zfMkNVMr}b7xO@487gtXS01*y-Pnwq%5k;iowNeA-Z6_j75q}cU2xRCHpuVB^Noear zI`)})b4-z z7zW0nC#A$t3iGnk_Z^lK^7VuJA>o+FjRjz;oVQB<;33POf6%F63a71NW{jqo!tF;N zk-RmMDSLCa=6@hUjYjpL^B`K#)S1`DR2#nTY$bDdD7-qINSzARg8&?%Iq=5f&c$v1 zG2y)Ic)+nF#!~PIT!f)y(!(#mqSZ!((>!=}{hF>Xs0gQN=HC04m?cydZw(P>?yTDm zBBZ~5`I%*J^f~eN2OsnI^JlEhId%n;08xrSNyeSaPk;FDw`c6Nky7~qSU|ey3)R6?Zq|qp277Ht1PBZz)0fQ9brco4 zoLJVKloRsP58s8vO~k!9*_6}yOv#yT-x<1&!{NZX?+oL}zHN+s&pb^W#*y^m>M8Dx zK+&98mwyQr!OVE)@>5J-FiwW~yDQ0wLs0w3B49U24Jks1bbcJGu0TIDz+X(lY3-_OV z#_2TS0?WLBJE$`DJ=Gf*j~-*H