Added clinker brick wall. Fixed missing check for ie:stone_deco in recipe constants.

1.12/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
+version_engineersdecor=1.0.1-b1
 #
 # jar signing data loaded from signing.properties in the project root.
 #

1.12/meta/update.json

@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.12.2": {
+    "1.0.1-b1": "[F] Fixed missing condition for ie:stone_deco in recipe constants.\n[A] Added clinker brick wall.",
     "1.0.0": "[R] Release based on v1.0.0-b4",
     "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.",
@@ -9,6 +10,6 @@
   },
   "promos": {
     "1.12.2-recommended": "1.0.0",
-    "1.12.2-latest": "1.0.0"
+    "1.12.2-latest": "1.0.1-b1"
   }
 }

1.12/readme.md

@@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.12.2.
 ----
 ## Revision history
 
+    - v1.0.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants.
+                [A] Added clinker brick wall.
+
                 -------------------------------------------------------------------
     - v1.0.0    [R] Release based on v1.0.0-b4
                 -------------------------------------------------------------------

1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java

@@ -154,8 +154,8 @@ public class BlockDecorWall extends BlockDecor
     boolean e = canWallConnectTo(worldIn, pos, EnumFacing.EAST);
     boolean s = canWallConnectTo(worldIn, pos, EnumFacing.SOUTH);
     boolean w = canWallConnectTo(worldIn, pos, EnumFacing.WEST);
-    boolean straight = (n && !e && s && !w) || (!n && e && !s && w);
-    return state.withProperty(UP,!straight).withProperty(NORTH, n).withProperty(EAST, e).withProperty(SOUTH, s).withProperty(WEST, w);
+    boolean nopole = (n && s && !e && !w) || (!n && !s && e && w);
+    return state.withProperty(UP,!nopole).withProperty(NORTH, n).withProperty(EAST, e).withProperty(SOUTH, s).withProperty(WEST, w);
   }
 
   @Override

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

@@ -52,6 +52,7 @@ public class ModBlocks
   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 BlockDecorWall CLINKER_BRICK_WALL = new BlockDecorWall("clinker_brick_wall", BlockDecor.CFG_WALL_DOOR_CONNECTION, Material.ROCK, 8f, 50f, SoundType.STONE);
 
   public static final BlockDecorDirected TREATED_WOOD_POLE = new BlockDecorDirected(
     "treated_wood_pole",
@@ -81,6 +82,7 @@ public class ModBlocks
     REBAR_CONCRETE_BLOCK,
     REBAR_CONCRETE_STAIRS,
     REBAR_CONCRETE_WALL,
+    CLINKER_BRICK_WALL,
   };
 
   private static final Block ieDependentBlocks[] = {

1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_wall.json

@@ -0,0 +1,20 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:wall/clinker_brick_wall_default",
+    "textures": {
+      "wall": "engineersdecor:blocks/clinker_brick/clinker_brick_wall",
+      "postside": "engineersdecor:blocks/clinker_brick/clinker_brick_pole_side",
+      "top": "engineersdecor:blocks/clinker_brick/clinker_brick_top",
+      "particle": "engineersdecor:blocks/clinker_brick/clinker_brick_top"
+    }
+  },
+  "variants": {
+    "inventory": { "model": "engineersdecor:wall/clinker_brick_wall_inventory" },
+    "up"   : { "false":{}, "true": {"submodel": {"clinker_wall_up"    : {"model": "engineersdecor:wall/clinker_brick_wall_post" }}} },
+    "north": { "false":{}, "true": {"submodel": {"clinker_wall_north" : {"model": "engineersdecor:wall/clinker_brick_wall_side", "uvlock": true, "y":   0 }}} },
+    "east" : { "false":{}, "true": {"submodel": {"clinker_wall_east"  : {"model": "engineersdecor:wall/clinker_brick_wall_side", "uvlock": true, "y":  90 }}} },
+    "south": { "false":{}, "true": {"submodel": {"clinker_wall_south" : {"model": "engineersdecor:wall/clinker_brick_wall_side", "uvlock": true, "y": 180 }}} },
+    "west" : { "false":{}, "true": {"submodel": {"clinker_wall_west"  : {"model": "engineersdecor:wall/clinker_brick_wall_side", "uvlock": true, "y": 270 }}} }
+  }
+}

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

@@ -22,6 +22,8 @@ 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.
+tile.engineersdecor.clinker_brick_wall.name=Clinker brick wall
+tile.engineersdecor.clinker_brick_wall.help=§6Simplistic clinker brick wall.
 
 #-----------------------------------------------------------------------------------------------------------
 # Ladder blocks

1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_default.json

@@ -0,0 +1,9 @@
+{
+	"textures": {
+    "wall": "engineersdecor:blocks/clinker_brick/clinker_brick_texture0",
+    "particle": "engineersdecor:blocks/clinker_brick/clinker_brick_texture0"
+	},
+	"elements": [{
+    "from": [7.9, 7.9, 7.9], "to": [8, 8, 8], "faces": { "down": {"texture": "#wall"} }
+  }]
+}

1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_inventory.json

@@ -0,0 +1,48 @@
+{
+	"credit": "I made this with the Blockbench",
+	"parent": "block/block",
+	"ambientocclusion": false,
+	"textures": {
+		"wall": "engineersdecor:blocks/clinker_brick/clinker_brick_wall",
+		"particle": "engineersdecor:blocks/clinker_brick/clinker_brick_wall",
+		"top": "engineersdecor:blocks/clinker_brick/clinker_brick_top"
+	},
+	"elements": [
+		{
+			"name": "Full wall",
+			"from": [4.5, 0, 0],
+			"to": [11.5, 12, 16],
+			"faces": {
+				"north": {"uv": [3.97, 4, 10.97, 16], "texture": "#wall", "cullface": "north"},
+				"east": {"uv": [0, 4, 16, 16], "texture": "#wall"},
+				"south": {"uv": [4, 4, 11, 16], "texture": "#wall", "cullface": "south"},
+				"west": {"uv": [0, 4, 16, 16], "texture": "#wall"},
+				"up": {"uv": [4.5, 0, 11.5, 16], "texture": "#top"},
+				"down": {"uv": [4.5, 0, 11.5, 16], "texture": "#wall", "cullface": "down"}
+			}
+		},
+		{
+			"name": "Full wall",
+			"from": [4.5, 12, 0],
+			"to": [11.5, 16, 16],
+			"faces": {
+				"north": {"uv": [4.5, 0, 11.5, 4], "texture": "#wall", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 4], "texture": "#wall"},
+				"south": {"uv": [4.5, 0, 11.5, 4], "texture": "#wall", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 4], "texture": "#wall"},
+				"up": {"uv": [4.5, 0, 11.5, 16], "texture": "#top"},
+				"down": {"uv": [4.5, 0, 11.5, 16], "texture": "#wall", "cullface": "down"}
+			}
+		}
+	],
+	"display": {
+		"gui": {
+			"rotation": [30, 135, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}

1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_post.json

@@ -0,0 +1,23 @@
+{
+	"credit": "I made this with the Blockbench",
+	"textures": {
+		"postside": "engineersdecor:blocks/clinker_brick/clinker_brick_pole_side",
+		"top": "engineersdecor:blocks/clinker_brick/clinker_brick_top",
+		"particle": "engineersdecor:blocks/clinker_brick/clinker_brick_top"
+	},
+	"elements": [
+		{
+			"name": "Center post",
+			"from": [4, 0, 4],
+			"to": [12, 16, 12],
+			"faces": {
+				"north": {"texture": "#postside"},
+				"east": {"texture": "#postside"},
+				"south": {"texture": "#postside"},
+				"west": {"texture": "#postside"},
+				"up": {"texture": "#top", "cullface": "up"},
+				"down": {"texture": "#top"}
+			}
+		}
+	]
+}

1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json

@@ -0,0 +1,21 @@
+{
+	"credit": "I made this with the Blockbench",
+	"textures": {
+		"wall": "engineersdecor:blocks/clinker_brick/clinker_brick_wall",
+		"top": "engineersdecor:blocks/clinker_brick/clinker_brick_top",
+		"particle": "engineersdecor:blocks/clinker_brick/clinker_brick_top"
+	},
+	"elements": [
+		{
+			"from": [4.125, 0, 0],
+			"to": [11.875, 15.98, 8],
+			"faces": {
+				"north": {"texture": "#wall", "cullface": "north"},
+				"east": {"texture": "#wall"},
+				"west": {"texture": "#wall"},
+				"up": {"texture": "#top"},
+				"down": {"texture": "#top"}
+			}
+		}
+	]
+}

1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json

@@ -128,6 +128,9 @@
     "name": "stickFerroMetal"
   },
   {
+    "conditions": [
+      { "type": "minecraft:item_exists", "item": "immersiveengineering:stone_decoration" }
+    ],
     "ingredient": {
       "item": "immersiveengineering:stone_decoration",
       "data": 5

1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json

@@ -0,0 +1,24 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:clinker_brick_wall"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "   ",
+    "BBB",
+    "BBB"
+  ],
+  "key": {
+    "B": {
+      "item": "engineersdecor:clinker_brick_block",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:clinker_brick_wall",
+    "count": 6
+  }
+}