Added IE concrete wall. Fixed missing rebar concrete wall recipe.

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.12.2
 version_forge=14.23.5.2768
-version_engineersdecor=1.0.0-b3
+version_engineersdecor=1.0.0-b4
 #
 # jar signing data loaded from signing.properties in the project root.
 #

meta/update.json

@@ -1,12 +1,13 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/redstone-gauges-and-switches/",
   "1.12.2": {
+    "1.0.0-b4": "[F] Fixed vanished recipe for the rebar concrete wall.\n[A] Concrete wall, material: IE concrete.",
     "1.0.0-b3": "[A] Textures of rebar concrete and treated wood table improved.\n[A] Added rebar concrete wall.",
     "1.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof).",
     "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.12.2-latest": "1.0.0-b3"
+    "1.12.2-latest": "1.0.0-b4"
   }
 }

readme.md

@@ -26,6 +26,14 @@ no tile entities or user interactions are used. Current feature set:
   explosion resistance than the vanilla brick wall. Also available as stairs, also
   with reverse recipe.
 
+- Rebar (steel) reinforced concrete: Expensive but creeper-proof. Crafted 3x3 from
+  four concrete blocks and five steel rods. Texture design oriented at the IE concrete,
+  slightly darker, eight (position dependent) random texture variations with rust
+  traces. Also creaftable in form of *stairs* and *walls*.
+
+- Concrete wall: Solid concrete wall (not the vanilla wall design), crafted 3x3
+  from six IE concrete blocks (normal wall recipe).
+
 - *Treated wood ladder*: Crafted 3x3 with the known ladder pattern, items are
   treated wood sticks.
 
@@ -65,6 +73,9 @@ More to come slowly but steadily.
 ----
 ## Revision history
 
+    - v1.0.0-b4 [F] Fixed vanished recipe for the rebar concrete wall.
+                [A] Concrete wall, material: IE concrete.
+
     - v1.0.0-b3 [A] Textures of rebar concrete and treated wood table improved.
                 [A] Added rebar concrete wall.
 

src/main/java/wile/engineersdecor/ModEngineersDecor.java

@@ -31,7 +31,7 @@ import javax.annotation.Nonnull;
   modid = ModEngineersDecor.MODID,
   name = ModEngineersDecor.MODNAME,
   version = ModEngineersDecor.MODVERSION,
-  dependencies = "required-after:forge@[14.23.5.2768,)",
+  dependencies = "required-after:forge@[14.23.5.2768,);before:immersiveengineering",
   useMetadata = true,
   updateJSON = "https://raw.githubusercontent.com/stfwi/engineersdecor/develop/meta/update.json",
   certificateFingerprint = ((ModEngineersDecor.MODFINGERPRINT==("@"+"MOD_SIGNSHA1"+"@")) ? "" : ModEngineersDecor.MODFINGERPRINT)

src/main/java/wile/engineersdecor/blocks/ModBlocks.java

@@ -16,6 +16,7 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.fml.common.Loader;
 import wile.engineersdecor.ModEngineersDecor;
 import wile.engineersdecor.detail.ModAuxiliaries;
 import wile.engineersdecor.detail.ModConfig;
@@ -50,6 +51,8 @@ public class ModBlocks
   public static final BlockDecorStairs REBAR_CONCRETE_STAIRS = new BlockDecorStairs("rebar_concrete_stairs", REBAR_CONCRETE_BLOCK.getDefaultState());
   public static final BlockDecorWall REBAR_CONCRETE_WALL = new BlockDecorWall("rebar_concrete_wall", BlockDecor.CFG_WALL_DOOR_CONNECTION, Material.ROCK, 8f, 2000f, SoundType.STONE);
 
+  public static final BlockDecorWall CONCRETE_WALL = new BlockDecorWall("concrete_wall", BlockDecor.CFG_WALL_DOOR_CONNECTION, Material.ROCK, 8f, 50f, SoundType.STONE);
+
   public static final BlockDecorDirected TREATED_WOOD_POLE = new BlockDecorDirected(
     "treated_wood_pole",
     BlockDecor.CFG_CUTOUT,
@@ -80,6 +83,10 @@ public class ModBlocks
     REBAR_CONCRETE_WALL,
   };
 
+  private static final Block ieDependentBlocks[] = {
+    CONCRETE_WALL
+  };
+
   private static final Block devBlocks[] = {
     IRON_SHEET_ROOF, // model looks not good enough yet
   };
@@ -96,6 +103,10 @@ public class ModBlocks
     // Config based registry selection
     ArrayList<Block> allBlocks = new ArrayList<>();
     Collections.addAll(allBlocks, modBlocks);
+    if(Loader.isModLoaded("immersiveengineering")) {
+      ModEngineersDecor.logger.info("Immersive Engineering installed, registering dependent blocks...");
+      Collections.addAll(allBlocks, ieDependentBlocks);
+    }
     if(ModConfig.zmisc.with_experimental) Collections.addAll(allBlocks, devBlocks);
     for(Block e:allBlocks) registeredBlocks.add(e);
     for(Block e:registeredBlocks) event.getRegistry().register(e);

src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json

@@ -0,0 +1,17 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "wall": "immersiveengineering:blocks/stone_decoration_concrete",
+      "particle": "immersiveengineering:blocks/stone_decoration_concrete"
+    }
+  },
+  "variants": {
+    "inventory": { "model": "engineersdecor:wall/concrete_wall_inventory" },
+    "up"   : { "false":{}, "true": {"submodel": {"concrete_wall_up"    : {"model": "engineersdecor:wall/concrete_wall_post" }}} },
+    "north": { "false":{}, "true": {"submodel": {"concrete_wall_north" : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y":   0 }}} },
+    "east" : { "false":{}, "true": {"submodel": {"concrete_wall_east"  : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y":  90 }}} },
+    "south": { "false":{}, "true": {"submodel": {"concrete_wall_south" : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y": 180 }}} },
+    "west" : { "false":{}, "true": {"submodel": {"concrete_wall_west"  : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y": 270 }}} }
+  }
+}

src/main/resources/assets/engineersdecor/lang/en_us.lang

@@ -20,6 +20,8 @@ tile.engineersdecor.rebar_concrete.name=Rebar concrete
 tile.engineersdecor.rebar_concrete.help=§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.
 tile.engineersdecor.rebar_concrete_wall.name=Rebar concrete wall
 tile.engineersdecor.rebar_concrete_wall.help=§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.concrete_wall.name=Concrete wall
+tile.engineersdecor.concrete_wall.help=§6Wall made of solid concrete.
 
 #-----------------------------------------------------------------------------------------------------------
 # Ladder blocks

src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_with_ie_installed.json

@@ -0,0 +1,25 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:concrete_wall",
+      "required": ["immersiveengineering:stone_decoration"]
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "   ",
+    "CCC",
+    "CCC"
+  ],
+  "key": {
+    "C": {
+      "item": "#blockConcreteIe",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:concrete_wall",
+    "count": 6
+  }
+}

src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json

@@ -0,0 +1,24 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:rebar_concrete_wall"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "   ",
+    "CCC",
+    "CCC"
+  ],
+  "key": {
+    "C": {
+      "item": "engineersdecor:rebar_concrete",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:rebar_concrete_wall",
+    "count": 6
+  }
+}