From e93451b5951358c19d55228842290ad6aa640d6b Mon Sep 17 00:00:00 2001 From: Dimmerworld Date: Tue, 26 Dec 2017 12:30:36 +1100 Subject: [PATCH] Woop woop - Alarm work (#1380) * Alarm makeover Model, boundrybox, textures, name localization for the alarm * Actual translations for Alarm * Texture resize As requested (Didn't notice dimensions when I was grabbing off Prospector) --- .../java/techreborn/blocks/BlockAlarm.java | 39 ++++++++++++- .../blockstates/machines/lighting/alarm.json | 22 +++++++ .../assets/techreborn/lang/en_us.lang | 2 + .../assets/techreborn/lang/fr_fr.lang | 3 + .../assets/techreborn/lang/ru_ru.lang | 1 + .../assets/techreborn/lang/zh_cn.lang | 1 + .../assets/techreborn/models/block/alarm.json | 54 ++++++++++++++++++ .../techreborn/textures/blocks/alarm.png | Bin 1955 -> 0 bytes .../blocks/machines/lighting/alarm_off.png | Bin 0 -> 15598 bytes .../blocks/machines/lighting/alarm_on.png | Bin 0 -> 15827 bytes 10 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json create mode 100644 src/main/resources/assets/techreborn/models/block/alarm.json delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/alarm.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index 4b0e24892..c03b36d8a 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -2,19 +2,30 @@ package techreborn.blocks; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileAlarm; import javax.annotation.Nullable; +//TODO: On/off variants, Placeable on walls/roofs(faces), Visible when holding in hand, and recipe. + public class BlockAlarm extends BlockContainer { + public BlockAlarm() { super(Material.ROCK); setUnlocalizedName("techreborn.alarm"); setCreativeTab(TechRebornCreativeTab.instance); - + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); } @Nullable @@ -22,4 +33,30 @@ public class BlockAlarm extends BlockContainer { public TileEntity createNewTileEntity(World worldIn, int meta) { return new TileAlarm(); } + + @Override + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.MODEL; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullBlock(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { + return new AxisAlignedBB(0.19, 0.0, 0.19, 0.81, 0.18, 0.81); + } + } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json b/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json new file mode 100644 index 000000000..c91c40007 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "techreborn:alarm" + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "techreborn:alarm", + "textures": {} + }, + "normal": { + "transform": "forge:default-block", + "model": "techreborn:alarm", + "textures": { + "alarm": "techreborn:blocks/machines/lighting/alarm_off" + } + } + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index e5187da17..beab9c576 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -93,6 +93,8 @@ tile.techreborn:refined_iron_fence.name=Iron Fence tile.techreborn:lamp_incandescent.name=Incandescent Lamp tile.techreborn:lamp_led.name=LED Lamp +tile.techreborn:alarm.name=Alarm + #Ores tile.techreborn:ore.galena.name=Galena Ore tile.techreborn:ore.iridium.name=Iridium Ore diff --git a/src/main/resources/assets/techreborn/lang/fr_fr.lang b/src/main/resources/assets/techreborn/lang/fr_fr.lang index 0e08e6412..d60000f94 100644 --- a/src/main/resources/assets/techreborn/lang/fr_fr.lang +++ b/src/main/resources/assets/techreborn/lang/fr_fr.lang @@ -898,3 +898,6 @@ achievement.TechReborn:ore_Pickup=Nouveau minerai ! achievement.TechReborn:ore_Pickup.desc=Minez un minerai techreborn achievement.TechReborn:centrifuge_Craft=Il est temps de tourner achievement.TechReborn:thermalgen_Craft=Il est temps de chauffer + +#Blocks +tile.techreborn:alarm.name=Alarme \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/ru_ru.lang b/src/main/resources/assets/techreborn/lang/ru_ru.lang index 39d14d95b..e8716c558 100644 --- a/src/main/resources/assets/techreborn/lang/ru_ru.lang +++ b/src/main/resources/assets/techreborn/lang/ru_ru.lang @@ -87,6 +87,7 @@ tile.techreborn:rubber_leaves.name=Листва гевеи tile.techreborn:rubber_sapling.name=Саженец гевеи tile.techreborn:refined_iron_fence.name=Железный забор +tile.techreborn:alarm.name=аварийная сигнализация #Ores tile.techreborn:ore.galena.name=Галенитовая руда diff --git a/src/main/resources/assets/techreborn/lang/zh_cn.lang b/src/main/resources/assets/techreborn/lang/zh_cn.lang index 595e2a986..1d3a9de23 100644 --- a/src/main/resources/assets/techreborn/lang/zh_cn.lang +++ b/src/main/resources/assets/techreborn/lang/zh_cn.lang @@ -92,6 +92,7 @@ tile.techreborn:rubber_sapling.name=橡胶树苗 tile.techreborn:refined_iron_fence.name=铁栅栏 tile.techreborn:lamp_incandescent.name=白炽灯 tile.techreborn:lamp_led.name=LED灯 +tile.techreborn:alarm.name=报警 #Ores tile.techreborn:ore.galena.name=方铅矿石 diff --git a/src/main/resources/assets/techreborn/models/block/alarm.json b/src/main/resources/assets/techreborn/models/block/alarm.json new file mode 100644 index 000000000..7eea178d6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/alarm.json @@ -0,0 +1,54 @@ +{ + "textures": { + "0": "techreborn:blocks/machines/lighting/alarm_off", + "particle": "techreborn:blocks/machines/lighting/alarm_off" + }, + "elements": [ + { + "name": "cube", + "from": [3, 0, 3], + "to": [13, 3, 13], + "faces": { + "north": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [5, 2, 6, 3], "texture": "#0"} + }, + "type": "cube" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/alarm.png b/src/main/resources/assets/techreborn/textures/blocks/alarm.png deleted file mode 100644 index 890b42954f9e2bc30a7116dceef7999937091f75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1955 zcmcIle{9rL9PiLg-N3L2b0LbgLzzmi?OpFj3mrS|=I(@>W4p z@AE$2&-cgsc57`-^{m2qg&2m-3I_aj=snxI@1KF5yLQK2==FdWXfiOY=ppOQ!}jej z#jyNuR^Ut0JR(R!6X5A&LNWNXK#cS9XlzYW1U?QiTLi*u8N?ey zwYX2!A?~!fNReUfxSO*vE}FBmi*P&5xGCCAF%FVuc-qA~I6QL^$eJ!i`8xlz8C&Q} zAmXN}@f4LxrEDpOP1R!*!*Lu%+bO%9Lx3T`oih}vcf z1X4QTLQ>1oDn=$uC}30?XcS|kEtj&uQ0UIkWHN^~%&K-|C8KvrVk6w4L8=ZKYMU;? zs&=TDWm#jAnA@wh>4|YqC6R&&m_#rG31f1mw76=jMqIs(AGzh6HyZELAuv@vtg4A@ zqH41&xX*`|uaXr>O&L#FdNOe62PPB*(Z z{eD$!v!Z3~pQutv6%j`+AiNW}0Zns&gp$Wjf(R>;K!SjDd!U;G9!Bzbm@M1#x{MAA zNK9t6R7r>tdYr6VLc5{MMUzgEWk`;5u%rvIIavr<$VCWT68WgACjlx8ISFEr(v%p1 z|EtEQCR9D7N+`&V$@4*? zJ#5X45;8tsj64vnGawM6m3$}>nQ3{7FyEa+6SS!~M5I%f#RS4oqh<=|&>KV9n5N#S z+o?7{`<*r4U1|IunlphE<3Nc))Iur3@`AFO%|sfg|7K`>ZBk>(!cn)ghPgJ2K5~s3 zDu`M~ZMf^vsum2(O9lPjaQW_rJ;Kg8-kGl~y%oOED?GW-`)YG=3s;aTTSgQVSlhOhbDZ~X zym4lrcXe%L^F^h5<@Rrz-W=ZLz4+r%2e!Y^-tR4~cyZs!vBx`7J*RHAzP+h0u&_Y* zdSvS}NABxY?{Z?KYq0C} z<26?N|$q;`aIQP9(d;QJZ&R_kRF8k@1ck*vxPcJ{a?sA`b*!qnI Mt7`m5mNjqw2W17E6951J diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png b/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png new file mode 100644 index 0000000000000000000000000000000000000000..df4977e747ff9254884326055096b407c5672e80 GIT binary patch literal 15598 zcmeI3dvFuS9miL;AYemd*Mu69KU6u7@;IMPZymCzZJF2;-EY79`~7x5``gw1bB}JSzkg}L$^rnu(z;sj7WiAFeHP^bpc{G8 ze*hYbqqR*60EH#mM+ctnDFwiFRci37e&0rxm&4_pAP2vDE#-2og=SnX7i}`r zW-|qQP)d75+nng~PLYDr(IxIFiYk&6-eYXpf5Y7EzJgV!T+hON^*xvkgMvGjXDA zu~3SSz|&$#3_}+M4xX8H2+>wqm6cX`j(KO~IcKj*!R+Epn}Vjy=_V$mIovcQ?UpKq z^a{CQ{jt?CkyGVZgDi(U=_=baHF`sJb*ici-`XZc1Uas(a?_|wcD=LFL@%d`9$1eK ziZN4WTLa@_ZFbgdUBfV}$&?c$-4lu7gS9VkDmR}f)B2)uWI+nH&nrr{=kyppA6pku zR4&4cbzTpgd$}YDtW#iuF1x@`K__RU0uHN_a+w1nW#)O_?sA$$rz1Vd>FzT^du6^& zDNQKHMnPz)nFC?^xNQ=*Lv+5()@Cb-NgnlMpLuo;OS zj7jiZ;zBunw7Cc{S-@)H1m5DJoK|aqa*0+G6%bR&c(XYe;Os8WK9ypYFf&rsN(!u| z_M9q%wU#=0wu(Eaw@wKmDRqKGxtJnq8?(YVwKFqEPUb|>d{P^n<#_Gv@$g#tih`S- z)|wqw#&gn5nz@|wLy(T2<34wec&iw}m47-^s@L2>6gjBIxtLhl0xM)bJ2M@1x*Hna zO>1X$NctZvgu?Cm@0MYHyXya98M0N(w{npdQSi`H1w7R-zm-d`=k%R5wOeQIM7O}R zK{*!YRF4$qT0}Y;X>rrp#%xY^_6(|)LvqX~3!=y3re|x;@zVaBSa?dnise$flX25C z+R*-fZMTQoQvDrf6TE0f`<`^ol~LCwylbwEx@J8aBa-TY$7pJxNOO*t_7BRYU~GjC zd!ol~vsr9z8f`{BHc1IFs=-e?EtVp1>hTU_jgZi03h$-I&Wn|;)6iXv5u1b{CxO%`|Sr_*1;&r zWWf86(9J%03-9+_FD)${Qmsw!XUY5fFZeGwofp#Gs@~P!eR$(L&s6*Cm*2ZF`MrsL z<%U6riyu9)8 z@#I7@sn65;tXQ$4|DE5jTYcY?`=01}r1R$J%`eCQtqHeo-GbkBjg8l@Ux%aBYgfJ= zHjRyqRXMG-9(H140tSTXpwe*W*NgKii+=R696WdOcYnKLGTDo(3z_23Z@(5gX&k!x z?Irr9`UQV66>nT#?|psXPj}{5e*XA#A5DypJ$~fGI?MOBH=p~%4KXdRG^pDy`9Xmh7zSF51^+_2nCW06y}qy7;2ENWb~@HxGX%#a~!FqQA52 z7u$~>d^cFQ@S!#G(O0f6*lR5*)|Zt0^S1X(hIGO1XFt8tYd`o#=N)$}`{nSqADbN~ zMzu5ZKGSWUcAH@AHFudX9As1^c?6|Lnb! ze?NbA{6>Cp`?Z?8Us_h>Y&v{)`TfJs@A)P$EZh3$1B*b>=J%{^%_YT_(cQO$npdea z>w2DT{rPKW_s2G$c=_~OrDesR9>28nF5Q8y1#07>pX3)huO0IO{}IRF%?%F@4F7CL z*$)r*J^l5(&ccsxjE^Qf1MX($$lVXL`B(jl+2GyFG@tJauRB$cd}Tlf`t}(YE?j#1 RZEyiWT}{3BNY(Z|{{e`ZKYIWG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png b/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png new file mode 100644 index 0000000000000000000000000000000000000000..9d7a70c408e49efbddb6905b96b11b0c7a8fa5d1 GIT binary patch literal 15827 zcmeI3dr(tX9>))Yu7W63>!QUHqjqpLxp{|NlUOAxSVJv>jgO98?!5`OB)KsOB;e{= zv{P$ETC`TFPQ@wO^|h$uXs27B#jUTpF5T@^W!(-6S`bTZ*D5M|ZUQ76;0`m}{b%Q9 zCXe6wo$v3Q^Etos%l+rPJuhQ+Z1k9D06=Vdnkf^0$HBK~@BjcJ>YJCwLSu+4ZJ`H% zm=WAN0#s~E06^EwWLdlx^IV){9a4f~b7`sH;ex#Z&`EA2%dk!n7njIo3%mxgm>a0;)v+#zt7{;qr-L1&i1`T@CYQ>v zK160Szs%w2Rq650EQB-ZSXr+Fda{aKG?qzw*aA06&n%>!-toOnf+D-(xC-3%03V9P zXglqI5)Yibyw@qX@>nnH$z%IicbB`*)q5FhXmh$Pf%Eh!qy0=DGR_l}1yUinLwcBh zc&eKwysSHmW$ngbmd)#&y(l#`kX54OR~aY8`aF~L7%BenkoO>>k5x#?zf1FX1HV zbdwRTUCJ;NPLsL16uDI{v8t@O5}8J&kfbPOI*CrLAqi4VP%4@XEV8@2M`#mE7I29K zLkAB&#gZ_5S9;(&Rfxr=F&>yr zMPXS6b1hJL=F`i%w{|-0OrV0e2)Bpk4yHlec{007PFF?YG=T$-6C_uAj3k%7G^NM7 zwT7nErRqey9^Dl z$GBQ;XZ{Bp;UNnDyKU&-srtXzhENuhd4$tOQ%0;afjb-ew{yY$?0&L3PixPUsHaHW z%DNqd*T^^s8;!Y~Ha!+<42`J|)u2??&brMkMH`iRtheSc75C?a!zuwYmI$0qxgP7$ zhW58`r`=u<=&x1C;0u#;pB>V0H!5AoFAaC2(vULS$#{*hj0Pr(G>56Ue^5LCV?KP? zqm3H1TB+7!Xfvvq$M|Wx#l*lm@8RkdS4{&N)X}SOVMwTiQw#~i938@7Dug|j1de$A*zEMX7?2)`-d;^%{S1zZRaepA53&j;}exDX)x zrhto|58@SYAwc*|0T(|X#4F%Jfbg3FE`C0USHOh;;Wq_b{Cp6vfC~Y_Zwk2h`5;~a z7XpOe6maqLLA(Mk1PH$=;Ns_lcm-St5Pnm@#m@)v3b+s;{HB15pAX^{a3MhWO#v4_ zAH*x*LV)m_0xo_&h*!Xc0O2N|xuYd~y!fy(=`1v4S0T%*<-xP51^Fh1uRy_)T71(V;7xv=iRj^uY_7Tkk*o z5?<~Uk!hJ`0E#C9uxd2`58L7Q9RLbs0DPYV0KNr)-?HUPYi0ouNu-;mXZf$@ZaZ8& zA~G@(zR%PvXKzhNNTAI7xUc7z;@r*C_V!%Um*0M$FNYT$5|8_1&qoFtOU^@k%bmPK z@b*K(CzB2ytX}4-J`9Z|#|nnOGc?d=#%&@eC&zt6^H%k?DRZ|xee&qx?dvTuQ?&i4*PZ?U!q6YTQ3G7wL27KAvr?vf>>tW%*E}k?*5>=YrE>YEK|7Pz)iKiz++ZpDJ^qYujV{=537WVLCcwm)oVvh%3Pc__|%*)EP2rf(~nlgJsw?BnuCoJKZvWH^@m}zTlUV4=yiB*455=J?3Q0&DQU3tyi>d zOxm_>>y?C66NfK}A}mf>)OT$ayTF*KcYYS_S4Zsl=5=iZpe`gO4-^kwdShDC-o1;P zV#h@>(K}D-tn1_BNqb7-g1vwLao;a5Ed%WrD%)K)b4zQ&Ktj>_yZ4XO6(w%|pj2oV4 Q!*mAeGc!yFX5^Io2i4-fo&W#< literal 0 HcmV?d00001