From c78dd954fd620ebf3a38537444a6e636197807cd Mon Sep 17 00:00:00 2001 From: stfwi Date: Fri, 1 Mar 2019 23:41:05 +0100 Subject: [PATCH] Added clinker brick wall. Fixed missing check for ie:stone_deco in recipe constants. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 3 +- 1.12/readme.md | 3 ++ .../engineersdecor/blocks/BlockDecorWall.java | 4 +- .../wile/engineersdecor/blocks/ModBlocks.java | 2 + .../blockstates/clinker_brick_wall.json | 20 ++++++++ .../assets/engineersdecor/lang/en_us.lang | 2 + .../wall/clinker_brick_wall_default.json | 9 ++++ .../wall/clinker_brick_wall_inventory.json | 48 ++++++++++++++++++ .../block/wall/clinker_brick_wall_post.json | 23 +++++++++ .../block/wall/clinker_brick_wall_side.json | 21 ++++++++ .../engineersdecor/recipes/_constants.json | 3 ++ .../recipes/clinker_brick_wall_recipe.json | 24 +++++++++ .../clinker_brick/clinker_brick_pole_side.png | Bin 0 -> 443 bytes .../clinker_brick/clinker_brick_top.png | Bin 0 -> 501 bytes .../clinker_brick/clinker_brick_wall.png | Bin 0 -> 549 bytes meta/update.json | 3 +- 17 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_wall.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_default.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_inventory.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_post.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_pole_side.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_top.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_wall.png diff --git a/1.12/gradle.properties b/1.12/gradle.properties index af0c148..7afa083 100644 --- a/1.12/gradle.properties +++ b/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. # diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 3e4df43..3d53556 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.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" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index dff2b72..1ad36a6 100644 --- a/1.12/readme.md +++ b/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 ------------------------------------------------------------------- diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java index ed9a40e..0353e53 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java +++ b/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 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 ac89cca..3db9fbf 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/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[] = { diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_wall.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_wall.json new file mode 100644 index 0000000..ee36212 --- /dev/null +++ b/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 }}} } + } +} 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 6000cab..9e98077 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 @@ -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 diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_default.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_default.json new file mode 100644 index 0000000..177c6f9 --- /dev/null +++ b/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"} } + }] +} diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_inventory.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_inventory.json new file mode 100644 index 0000000..e4d523c --- /dev/null +++ b/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] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_post.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_post.json new file mode 100644 index 0000000..135974d --- /dev/null +++ b/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"} + } + } + ] +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json new file mode 100644 index 0000000..bb3657b --- /dev/null +++ b/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"} + } + } + ] +} \ 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 fb9df22..2018cd6 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/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 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/clinker_brick_wall_recipe.json new file mode 100644 index 0000000..89aae07 --- /dev/null +++ b/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 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_pole_side.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_pole_side.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2be157f28be52dfbd758f81cea99e027af9456 GIT binary patch literal 443 zcmV;s0Yv_ZP)2(c8jvJ&jA zlBk>9ow107@IQ15x1M=ON+2{!f)SXy4h%~&Z*dYuj_C9*j|1s|Dv070|u%HjCvmDk-vZDC)nKE2UUtzi5V-ACUg7eD>{V!L7ymsBE=XC%8002ovPDHLkV1nF%yaWIM literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_top.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe3f3710863b8e1acfb2d77c3156eb872d3315b GIT binary patch literal 501 zcmV4`Qxd)X+QjfqQ+2!#cs1biV{N};300000NkvXXu0mjfX7D8Bs&fox=g%Iek}B$hg6}ycA0FTH>`oBj-<5O1MG=v`IY3O7z=Whe2+hIG z2(mv1h}obDN}KcWfow=n;(v00c<0%3+?-fMCX)#OSF;%a8Y7kxqKcbQPp8bAhLjTK zfI$57^E*L=mBXqxz{A&Xx%hfUat2wU!u^-0M9;SDckQt1y@7PxeUJ%CC;}RTk_}dS z&V~!PKp7(%WN#LOl2b;$efqfOHK1E`jK)W}8OL=^b9qVIwq$dH?vC=-$qDlQ(OqB7 z_`$1FetkJRXtK(y5V-2omH}YNIAoIgw9bicFrcn$W|uQGD9x;4JUSx&{&7C&I*Ng+EV%vj1sCU^cT5Tu7J2!-pS*du zG1%@p2bw+s3{1KN%JMvK+bx5wt^$;*6h$#Gv25!zurydKI{MsGmL-^hDpgT%T-UU1 nOX@nzq3>E$^%@XvOmFfR-4`-C%a@1O00000NkvXXu0mjfJje1d literal 0 HcmV?d00001 diff --git a/meta/update.json b/meta/update.json index c8558cd..a4c7212 100644 --- a/meta/update.json +++ b/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.", @@ -12,7 +13,7 @@ }, "promos": { "1.12.2-recommended": "1.0.0", - "1.12.2-latest": "1.0.0", + "1.12.2-latest": "1.0.1-b1", "1.13.2-recommended": "", "1.13.2-latest": "1.0.0-a1" }