diff --git a/gradle.properties b/gradle.properties index ce61bf7..552907b 100644 --- a/gradle.properties +++ b/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-b1 +version_engineersdecor=1.0.0-b2 # # jar signing data loaded from signing.properties in the project root. # diff --git a/meta/update.json b/meta/update.json index 1f060ab..5f0dc95 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,7 +1,8 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/redstone-gauges-and-switches/", "1.12.2": { - "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." + "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.", + "1.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof)." }, "promos": { "1.12.2-recommended": "", diff --git a/readme.md b/readme.md index 5096bf6..97b53d0 100644 --- a/readme.md +++ b/readme.md @@ -74,6 +74,9 @@ More to come slowly but steadily. [A] Added treated wood pole. [A] Added treated wood table. + - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof). + + ### Community references Mods covering similar features, or may fit well together with IE and the decorations of this mod: diff --git a/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index 1f6bb5c..4e32f34 100644 --- a/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -34,9 +34,10 @@ import javax.annotation.Nonnull; @SuppressWarnings("unused") public class ModBlocks { - public static final BlockDecorFull CLINKER_BRICK_WALL = new BlockDecorFull("clinker_brick_block", 0, Material.ROCK, 1.5f, 20f, SoundType.STONE); - public static final BlockDecorFull SLAG_BRICK_WALL = new BlockDecorFull("slag_brick_block", 0, Material.ROCK, 1.8f, 25f, SoundType.STONE); + public static final BlockDecorFull CLINKER_BRICK_WALL = new BlockDecorFull("clinker_brick_block", 0, Material.ROCK, 2f, 50f, SoundType.STONE); + public static final BlockDecorFull SLAG_BRICK_WALL = new BlockDecorFull("slag_brick_block", 0, Material.ROCK, 2f, 50f, SoundType.STONE); public static final BlockDecorFull IRON_SHEET_ROOF_FULLBLOCK = new BlockDecorFull("iron_sheet_roof_block", 0, Material.IRON, 1.8f, 25f, SoundType.METAL); + public static final BlockDecorFull REBAR_CONCRETE = new BlockDecorFull("rebar_concrete", 0, Material.ROCK, 8f, 2000f, SoundType.STONE); public static final BlockDecorLadder METAL_RUNG_LADDER = new BlockDecorLadder("metal_rung_ladder", 0, Material.IRON, 1.8f, 25f, SoundType.METAL); public static final BlockDecorLadder METAL_RUNG_STEPS = new BlockDecorLadder("metal_rung_steps", 0, Material.IRON, 1.8f, 25f, SoundType.METAL); @@ -68,6 +69,7 @@ public class ModBlocks SLAG_BRICK_STAIRS, TREATED_WOOD_POLE, TREATED_WOOD_TABLE, + REBAR_CONCRETE, }; private static final Block devBlocks[] = { diff --git a/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json index bf91a4e..04aa8d2 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json +++ b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "engineersdecor:clinker_brick_model", + "model": "engineersdecor:decor_full_block_model", "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture0" } }, "variants": { diff --git a/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json b/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json new file mode 100644 index 0000000..cbeaeeb --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:decor_full_block_model", + "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture0" } + }, + "variants": { + "normal": [ + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture0" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture1" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture2" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture3" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture4" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture5" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture6" } }, + { "textures": { "all": "engineersdecor:blocks/concrete/rebar_concrete_texture7" } } + ], + "inventory": [{}] + } +} diff --git a/src/main/resources/assets/engineersdecor/lang/en_us.lang b/src/main/resources/assets/engineersdecor/lang/en_us.lang index 0856da8..f45193a 100644 --- a/src/main/resources/assets/engineersdecor/lang/en_us.lang +++ b/src/main/resources/assets/engineersdecor/lang/en_us.lang @@ -10,12 +10,14 @@ engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r More info§6]§r engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Help§6]§r #----------------------------------------------------------------------------------------------------------- -# Wall blocks +# Stone/"ceramic material" based blocks #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.clinker_brick_block.name=Clinker brick tile.engineersdecor.clinker_brick_block.help=§6A brick wall block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block. tile.engineersdecor.slag_brick_block.name=Slag brick tile.engineersdecor.slag_brick_block.help=§6A gray-brown brick wall block with position dependent texture variations. +tile.engineersdecor.rebar_concrete.name=Rebar concrete +tile.engineersdecor.rebar_concrete.help=§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian. #----------------------------------------------------------------------------------------------------------- # Ladder blocks diff --git a/src/main/resources/assets/engineersdecor/models/block/clinker_brick_model.json b/src/main/resources/assets/engineersdecor/models/block/clinker_brick_model.json deleted file mode 100644 index f7aee27..0000000 --- a/src/main/resources/assets/engineersdecor/models/block/clinker_brick_model.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:blocks/clinker_brick/clinker_brick_texture0" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/recipes/_constants.json b/src/main/resources/assets/engineersdecor/recipes/_constants.json index d47adc8..fb9df22 100644 --- a/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -114,7 +114,6 @@ ], "name": "ingotAnyBrick" }, - { "ingredient": [ { @@ -127,6 +126,13 @@ } ], "name": "stickFerroMetal" + }, + { + "ingredient": { + "item": "immersiveengineering:stone_decoration", + "data": 5 + }, + "name": "blockConcreteIe" } ] \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe.json b/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe.json new file mode 100644 index 0000000..f3cf998 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:rebar_concrete", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SCS", + "CSC", + "SCS" + ], + "key": { + "C": { + "item": "#blockConcreteIe", + "data": 0 + }, + "S": { + "item": "#stickSteel", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:rebar_concrete", + "count": 4 + } +} diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture0.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture0.png new file mode 100644 index 0000000..1b9127e Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture0.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture1.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture1.png new file mode 100644 index 0000000..bc04cff Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture1.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture2.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture2.png new file mode 100644 index 0000000..2181837 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture2.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture3.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture3.png new file mode 100644 index 0000000..84788f2 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture3.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture4.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture4.png new file mode 100644 index 0000000..3766561 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture4.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture5.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture5.png new file mode 100644 index 0000000..6b8b76b Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture5.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture6.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture6.png new file mode 100644 index 0000000..ffe671a Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture6.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture7.png b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture7.png new file mode 100644 index 0000000..8f07585 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture7.png differ