From d64890228a15b2cf61b1a3266f9346db790f1e22 Mon Sep 17 00:00:00 2001 From: stfwi Date: Tue, 12 Feb 2019 22:35:21 +0100 Subject: [PATCH] Added rebar concrete. --- gradle.properties | 2 +- meta/update.json | 3 +- readme.md | 3 ++ .../wile/engineersdecor/blocks/ModBlocks.java | 6 ++-- .../blockstates/clinker_brick_block.json | 2 +- .../blockstates/rebar_concrete.json | 20 ++++++++++++ .../assets/engineersdecor/lang/en_us.lang | 4 ++- .../models/block/clinker_brick_model.json | 1 - .../engineersdecor/recipes/_constants.json | 8 ++++- .../recipes/rebar_concrete_recipe.json | 29 ++++++++++++++++++ .../concrete/rebar_concrete_texture0.png | Bin 0 -> 608 bytes .../concrete/rebar_concrete_texture1.png | Bin 0 -> 615 bytes .../concrete/rebar_concrete_texture2.png | Bin 0 -> 641 bytes .../concrete/rebar_concrete_texture3.png | Bin 0 -> 620 bytes .../concrete/rebar_concrete_texture4.png | Bin 0 -> 614 bytes .../concrete/rebar_concrete_texture5.png | Bin 0 -> 619 bytes .../concrete/rebar_concrete_texture6.png | Bin 0 -> 613 bytes .../concrete/rebar_concrete_texture7.png | Bin 0 -> 615 bytes 18 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json delete mode 100644 src/main/resources/assets/engineersdecor/models/block/clinker_brick_model.json create mode 100644 src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe.json create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture0.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture1.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture2.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture3.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture4.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture5.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture6.png create mode 100644 src/main/resources/assets/engineersdecor/textures/blocks/concrete/rebar_concrete_texture7.png 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 0000000000000000000000000000000000000000..1b9127e683a41f031dddaaadd338c5e80eaf7ad3 GIT binary patch literal 608 zcmV-m0-ybfP)L_t(I%Po^R5*$ek1Cv+vjHLg` zmA(JpnXZGRjFtsDi~y2^{P*W~B2KulPb1yTy>NFLctxFY+8tgIb_!&;Uhsfe+N!0dVdl6Q5rI;OfB-^2DuSz^W=@17s+?@@ncQ<>YOFaCfy$<+`0Ipe%P zh$w2#J_lF%2TU+C0IHjF5;vy=vWggisGuT>s?lBicwdNs`?L7HCu`oA8SnQGpvZHW z_l<~9=b-9_sBqRo)IpW1V(*QpAQq?!Yj3I=(dXUwDKJN=#w^Gx=A48(dvDZ?;ZEgY z-V;~BR5@o;T?j?E;oXpX@&5Uf&g7mO5h21+k!KzkN&<#?AUquI`$of*@0#>Eh$!L4 ub-nn0Zq7*%d8%AWX0g}g^Zh_KCcm6iqV|+b>Z$5Fk541vG=Aj`1AZ?$Dx^F zE?Sjg2ImyLIciR?f#g8(T8lX*f1VQ%85=Vw2^qAkVy{IXgV$P&-Y|@a0Ex%woGPq} z*f*_rY6t6n(OW~A#Tb*(C$2_BqTl?{JB2|NXD2(0LbzbgC#{J#=j7g-h#&gsxQTTy zW^Y_;0mg}gB$_)$5tYb9&qzF$$AD=bF?&P{XYS_}1#yi;Y|`yfj) zlhB}H#=34s?-+&L0g%KTgWft3o6Pzo%W!w7KqP9dG3P|?Jf2UeqA2E=?CU}@?rSrC zL5)7x`;Y;JQ01XA7`=U-ZXzS8O1w3yK2@*lLKOGeU`AB&z7EPv%!J9PN=Ex1(!DqP zzL3P@@x)zFaPAubGLc$CF02Z9lo=U^%p$9Jj6p_lt&7Lk7kO@Ws4wf`{WW{sT}ON9(r^eFOji002ovPDHLkV1i0S B7s3Dl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..21818378598a36601024251086b9dd58efbf244e GIT binary patch literal 641 zcmV-{0)G98P)q0~^Q{L}4SG!O-*!^UTFWe1LB{R?+$?xC);pEAY&q)(5i>)(WnxVlIdXmpgq-iaT>`jv6}-_v7M- zq9oc{BVwbblv)r`4j?D_^Lin`9Gy7_9B>nMY{nQwCa$We2xd;ijI**CO@=g6Dm+=0d;cT1vr88FOJOR5#p> z(Z6sr_FAL}A_fRw?~cevYl@)}i#{f1&RidgwF5JwxO26Jau5N|!A;>L5rLdUO_lq8 zV(zqdvF0K&F}07*lf2&pIfper}sbHmm2&zWC9%LrkiqqHP>;%AAA1h_%T`M1?s9 bxi|j<6Mtb0bY_sa00000NkvXXu0mjf7w{dK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..84788f2ccf9a8d3bb5d18982bbffa0b74a0a953b GIT binary patch literal 620 zcmV-y0+aoTP)(2(Hj05S_dd2oa1gS{4&2QveVF)oUtMZ>+(Bgi~t2?4D+{(L|5G0D9c zy|YUguu`l_`urdnZiRF(b9xNi43qGPKzZ0FsVYqMldy_02H(#@ty5~4IqO|yZp@%O z2yf2HqP0MX>$)h3F8v6b4v3YB1Mbe8laq-l@i{L>4_fbl@jNeCMMUR)7v36`;vR#< z=+Vh6r~({+pD)hd7-FA;nW%H9O6Huj)+pdPhi0(O=H$WMkqXaDz%YYrcIFtEIg(g= zv)79x?&~I^F?vUtU`Dit&->>7+?=&(F?iMn#5o6V4UfTf{V+>#vgl)QPH_aW-$ljX zT?@Q1$KdQuivS5#veyPTkp7G}RU&#L%p6m3e?IKBI2eYQ^QZOm{V+ctl$#V_PHUYp zgQ_ID8^71fXpP*H|9a@ zqNn*}q9Vdt2cS?;RSd!a;f`8hs#Fel4Lt%X#5yn&JR;bcD9t*9Y53eXuEOj2L`2#9 z#!L}}V+Ge$R23@%cmGKbH?HS5W{#V)JWw0D8+RkCafa*qkUh9N)rEe4zZg-V2@{6G z1pa${czxdV47oQ`o9>N@vf{v05e7FiT!r`h#wn^Bv%n2JPWHX=^T0&dI~jzoO?7h| zCmt)fJ{P_YNLZoNfSK_)PZ;Rj+}Xh3=EMpllg^E*8pnB{YM{Z+CMz*B-mfPS&gXrx z+!#?zmF}jpP&KsjCijhqkX1k01J~!m%zqFg*gb>_BhWK=I6F69)rc5siklE&s0-at z-Kc<@f&SdRtLSdjj4;F3c|Z^Qx;P$RT-TefW*EdAvB0Fs9=ZoL2Pp<+)X>hN{U zC`=XRfeL`K@8r5S|9pL+3f0QKH=UdLyJo8RACxgumR(6JJpcdz07*qoM6N<$f^eD^ A5&!@I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6b8b76b3fb1396596a33a8a5de490151fe09526d GIT binary patch literal 619 zcmV-x0+juUP)SvLrbS1Ct*~)jjuH zcm2KoOute|BDqG7j|fC2ApiaQPl+fQixS7oDGF6%J`e9PI0ffyDw8o@?6YZRm>Vi6 zYJ!SF1-(0&MIRUAx|nOBA~aKaAM8Ep%_$L7KzAgc-yfie2-bQK;OFxPsu;a-KM(3g zo<(bo`=0DI`SZC^Goz0SYZofcIf=IhfQlgMTw_2fAxb1%qodw26WrW60p}cibgE$O zMR#Z3H)>8*0uWjB%h>0j)=+o!D?$)8&Iu|L_eK?5uQ%?_7=uFStpnfe`s+s5vp@}1 z;r)6M2r9z84)-%rGpM4wVg{9osWW<~B2WQLVC}=46Ec8ArD%UK0w|PBCh=hosxzk#M3{-_Un~ESK0LZiP*XvDHvew4b*?WTuuj|Fx8$_rCQfAptWdGVl`xRj?1e87ki=uC+L- zxG9;5yOX)8*i;sBHCzSv<}`1tIk7&zoIq7!?jXt-Mij&glH@iJ1U(m!sOkQo zt~$^2yQ@eb7agd3n8o5DfB*fbBjFszX9cgr`FVesb5h-$?%a`71r>?;fv6zes43np zjKhdXhASZ7^n(f4ePo&jzL6HRY=3?%{T_G&>}=7 zu{VeyV#IYJqNs>)i~|*i7HF{Hm>Hm`9hfSyi$w5oQkfu%yP{@Bb+h*c0wThWgbFG) zl}YS{2&fuDQ=N=40MM$0F6Nx5G+n`AimIVLo*M2{!!RczK%MHQ0gZU#+}DR;MgbX% zmBsu0rV+Y|Ih3xAs^aE!6$)r~Ll>ZA22zQ;(G{HIag1*6U1T*~jk{7+lo)EmX#`ON z;5;YQLPT-SiQ9t{8Uf6dj9?6>bEBrl7>=4zt=v1fqj4Q(mu=bq9JLXczYm=5f*u<1i`%9VWC2 z>$;xz379#b_r+QP0PLkBHFcj49We!ZA$^7H+TnPF;({vN2X zBN#4F$#5f2kbOWDtt#9N8WceQ1a<@OiYxW&B?&b*n2}AGB;~2RGs0@P{rLH0bctc2r5vOR0eZS&OWFct`ieJwGE&N z6d%*s`{Q-EvF1cn(JY2LT}^kA*(jgs`fR09P=*_GEmW0=L{yk=y#D(ap^1}BcLKr0 z=x!^$9|#Y;?{^p3Pbp0%R5DlLFigRb@V(Jg!M0j4@Gl=DILb z+ys(F;^1SVBHXz-`!I%MX2jW4LB>aSWc=zZ{s)RWPylvupm6{I002ovPDHLkV1mY{ B1`PlJ literal 0 HcmV?d00001