From 7eecdea7945f3f6f58ea2269aecfb0dd74040947 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Wed, 10 May 2017 13:20:00 +0200 Subject: [PATCH] Build 1.4-8 Added the missing textures Fixed a few minor bugs --- build.gradle | 4 ++-- changelog.md | 3 +++ .../controlpanel/TileEntityRSPanelConn.java | 2 +- .../client/panelmodel/PanelModel.java | 2 +- .../controlpanel/CoveredToggleSwitch.java | 5 +++++ .../assets/industrialwires/lang/en_US.lang | 2 ++ .../item/panel_component/toggle_switch.json | 6 ++++++ .../panel_component/toggle_switch_covered.json | 7 +++++++ .../models/item/panel_component/variac.json | 3 +-- .../textures/items/background.png | Bin 543 -> 491 bytes .../textures/items/indicator_light.png | Bin 456 -> 499 bytes .../textures/items/indicator_light_back.png | Bin 467 -> 502 bytes .../industrialwires/textures/items/label.png | Bin 464 -> 505 bytes .../textures/items/slider_track.png | Bin 451 -> 480 bytes .../industrialwires/textures/items/switch.png | Bin 0 -> 507 bytes .../textures/items/switch_cover.png | Bin 0 -> 199 bytes .../industrialwires/textures/items/variac.png | Bin 0 -> 513 bytes 17 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json create mode 100644 src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json create mode 100644 src/main/resources/assets/industrialwires/textures/items/switch.png create mode 100644 src/main/resources/assets/industrialwires/textures/items/switch_cover.png create mode 100644 src/main/resources/assets/industrialwires/textures/items/variac.png diff --git a/build.gradle b/build.gradle index 265873b..f15ba21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ -def mainVersion = "1.3" -def buildNumber = "8" +def mainVersion = "1.4" +def buildNumber = "9" /* * This file is part of Industrial Wires. diff --git a/changelog.md b/changelog.md index 40cfa35..acc3bc4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +#####Version 1.4-9 + - added Control Panels + - They can be used to control and monitor a lot of redstone signals from a few blocks #####Version 1.3-8 - the converters and the motor don't have missing textures any more when using Chisel #####Version 1.3-7 diff --git a/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java b/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java index 5be5886..d09afc1 100644 --- a/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java +++ b/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java @@ -322,7 +322,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem aabb = new AxisAlignedBB(0, 0, 0, h, 1, 1); break; case EAST: - aabb = new AxisAlignedBB(1-h, 0, 0, 0, 1, 1); + aabb = new AxisAlignedBB(1-h, 0, 0, 1, 1, 1); break; } } diff --git a/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java b/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java index 3912edc..c5d4369 100644 --- a/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java +++ b/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java @@ -151,7 +151,7 @@ public class PanelModel implements IBakedModel { new ItemTransformVec3f(new Vector3f(), new Vector3f(0, .1F, 0), new Vector3f(.25F, .25F, .25F)),//Ground new ItemTransformVec3f(new Vector3f(0, 180, 45), new Vector3f(0, 0, -.1875F), new Vector3f(.5F, .5F, .5F)));//Fixed; @Override - public ItemCameraTransforms getItemCameraTransforms() {//TODO very much cache this! + public ItemCameraTransforms getItemCameraTransforms() { return transform; } diff --git a/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java b/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java index 7b5dadf..aa4780a 100644 --- a/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java +++ b/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java @@ -147,6 +147,11 @@ public class CoveredToggleSwitch extends ToggleSwitch { return super.fomatConfigDescription(type, id); } + @Override + public int getColor() { + return color; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/resources/assets/industrialwires/lang/en_US.lang b/src/main/resources/assets/industrialwires/lang/en_US.lang index bf5b46d..e399046 100644 --- a/src/main/resources/assets/industrialwires/lang/en_US.lang +++ b/src/main/resources/assets/industrialwires/lang/en_US.lang @@ -33,6 +33,8 @@ item.industrialwires.panel_component.label.name=Label item.industrialwires.panel_component.indicator_light.name=Indicator Light item.industrialwires.panel_component.slider.name=Slider item.industrialwires.panel_component.variac.name=Variac® +item.industrialwires.panel_component.toggle_switch.name=Toggle Switch +item.industrialwires.panel_component.toggle_switch_covered.name=Covered Toggle Switch industrialwires.desc.wireLength=Wire length: %1s block(s) diff --git a/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json new file mode 100644 index 0000000..934ac92 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0":"industrialwires:items/switch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json new file mode 100644 index 0000000..1765dff --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json @@ -0,0 +1,7 @@ +{ + "parent":"item/generated", + "textures": { + "layer0":"industrialwires:items/switch", + "layer1":"industrialwires:items/switch_cover" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json b/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json index d5f234d..275556a 100644 --- a/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json +++ b/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json @@ -1,7 +1,6 @@ { "parent":"item/generated", "textures": { - "layer0":"industrialwires:items/background", - "layer1":"industrialwires:items/button"//TODO change when there is a proper texture for it + "layer0":"industrialwires:items/variac" } } \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/textures/items/background.png b/src/main/resources/assets/industrialwires/textures/items/background.png index 9b7fe1621cee1dce84d8e194b56b6e63e09f1802..83f1b8905da01cdde5b9ffed58169a162b7b80d2 100644 GIT binary patch delta 378 zcmV-=0fqjb1nUEkQV9hK4jC7+_}I-Jkv@_0N%RpFe2 z_Z}hwRRu|o^^d#EZ-rxQ1ujaC#h14*QmKoYOl3nUR^L`n(I=M!dz7$b7d zASpj0s47IHqR(bCc*% z-unp+r4)GY5o1ItWm+IgDQMdkBoSsp;12^cLn#G0X8^!33~J&q$n2>AN?LeBYj z+|M)KZZ|F#i+cCI?`w=nH%)`f<-+xPt$+PU*Xxyi--9H~tnNouVP?GF@3P8O84(E*f(P&$#0N+g9n3Je>w;a6j=g)pI&r(@s;+XkfgiV~(Y3I>D0uez>3CX;^& zM1*E0B=LH^001#Y$@3iN^Em?0Hw9Hy>Fsv=Jsywq7^9dONJ8XOpoqXZ2a@pK<8rz1 zbUG;j_{CxYk|Bi9Gc!J)Pna11bR>x=%d(X3tb0|3ndz5LA=!b`Ze|@(zu)f&k-V5$ z{9Y|dPmd@fAc?xJ5kkOnx%?#9@ArQI@cIr`Rith>=ir=!h#<={gb>*4^`ui!6h%x` z5+JoPgn$r2cdqLiA_6nx+ZrrDlq^60002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jK+@3Ns(VW#E93TP%N9Nklb7au1Wa7B?Xn3u0g- zZbC6q5EH>4=7*W?y1~V{%6l8Qx3Yp$U!POe@axOGH+i0OJRZ5-Ziom;lHi=f7=wtQ zs?>GOdcE#ulK0{Le$Q|?L`1&n#!wUm0Bzgiy~jC6k|eBFs~>*{d7iV|?HG+ls4A+8 zh%lW__4UAHGBHI_;G9E5I2;ZvmrLX&u-2lgv~7#3@_ar&vfl4^thF>vLkIy?{fr(yeFTh$$jFAum099215JF%!n^D&_X`1qQJP0BD#C<>G z<#J<6|p%aSxrKl&`oIGs)`7K{IXr1SYqS(d0O*4l1AB7(J+>-EZJv*8cb7b<9^ Ut&Q1sdH?_b07*qoM6N<$g16the*gdg delta 383 zcmV-_0f7GV1IPoADlz{6{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jK)84>Jo3vF}`wTP%MpNkl6FsfV<6BZ)P+z`{2)yjF+-3IUbLwD&BiS2#5%(ikZ>2Er-J) z6Yyj5`Fv(RpQEbZ>LS#24M5j*6h(pep8bBGJ1EPN)9J))Hp73+Ff&%GmAygBpCK+zv4OxE3Aq2el zR8=L5#X_p866f4dW?k3B7(X3^5a|0J=Nw(v0gzG}3RG26N)$zr31l6-UazbJ?>+1F z8i2NKi81ncJhDRwGCt$&c4Io74tATSA;y^P_xqjgcKiEBx?Zm|O@o=?oE!R4Rh)Bd dHXHugd;#U7ig@9_r|19x002ovPDHLkV1jixsw)5h diff --git a/src/main/resources/assets/industrialwires/textures/items/indicator_light_back.png b/src/main/resources/assets/industrialwires/textures/items/indicator_light_back.png index b6af7aaa01b108195adbd603b73381534b607eb3..60406aa2689e9d9b2ec4fcf9d5552711e3aec49b 100644 GIT binary patch delta 389 zcmV;00eb$^1NH-uQV9hL3NkEYuCUjUTP%NCNkl*N1scilSh@-^a`4 zVnl>2%W%$Nj6ph+J-#cEf z*DKaq9*+kh1XR^@EQkokn1tT%_d5cE!65b3b)9+>fiVVEO^7i@KGtjfH<{?idaYGe z(Y7s58{Ye_fOGDNMvM{X8~`y!0P=A>C&oyg=cp>)d+i8VYl$%uLI9wyYXCwBOs7+t zrons9?RF!C@NM_?jHlB{hr?mIdsS6l*~*W++F=xjEVA0O#>JZe={s4CXlv>y?{ jTC3;t*{oJ8!{3QdFeA1cq)1aA00000NkvXXu0mjfeb;@5JmsY>@L0lm!RTW zE&`V!N8kWRNQiC8{r`4>KR?o6@;t}!c%-Vr zIS21OLbp8rK(}&u7l(bEtmZhzQEE1OPNmBUzTgIoIv?dmSXm^BjMt z(}}a$3?xAk@2gcxw^%OuGV|W!a=CD~+bIAfCo=;{v~4@;NfOWJ6C#2bBS^}qf~rD9 zK=Ma}$z(FPOS;tMTkO4ua}FOx!MDYNA4NekOEAl_LoraQpss6#5b$_B1{I|LjJMm3)9EzDt*Qzkgu#Bl z-?`mx_1BMdydT za?ltMU5ie1A%Zw?Oo_)d2a*n)u@U(=Wyx={`rv4BF}S<$0N7f z4OPW^PY3}KK~*s`%Ccm$*|Z%0N#5`G^m;v1^+#QV$KwG&UDsq;MhF4#J?r)Q?I3^8 zb9TEO{eB-a!^}`sX0w?AOePa~iG>hQRSt&(tJUi5z&VGRQP*`#9u9{hBFyJ=8w>`L zrYTib;l0PqevhE4h)8Q4V6j-(tKaE#THN#bY%#5Xh+t-f5ZVQe$72x@rqihvML`IG zx~@snlq5-h1Yh6~0x?F+jHYP-sH$|T&9f|{X&SOD!_58^aL&;*4KYRlzP`T1dryp! z(P$)PS&}3P_xqg~<9poCGhQwiy4`Mj_o66BlH^yNrYWb>iRE(n_eVOP&lE+0nc%V-zmKX{4S&AmUF3Pre!oXm@!k_c zKtxbg%#5n4*zI;5fPXh1k4J{XA*%XK7vX-t15npBS(f3wXS>~YJIM2#!{NYSFu;Gz zFf&w@q9_btKA+1A7DC{3Ii-_=iJ~6Y;5mXfs z>0B-ri&pe{z0SK2z{?y$Xfv42W&%(Yg^5U;NsO@t=<5(dAf<$vQP(vGLcKFs)#XiyWKh?$om>Emka%VzukRVmc$r4`g*;x xUax=uNaypJvMez(oO5kHs)}=t)oR5*t1pWImapQSkx2jm002ovPDHLkV1iv_qdEWp diff --git a/src/main/resources/assets/industrialwires/textures/items/slider_track.png b/src/main/resources/assets/industrialwires/textures/items/slider_track.png index eff37587e1c059c4f0fbd4be1305760d4a74e940..887ad6776887e683dcc8a11c8e1bff62d89d56bd 100644 GIT binary patch delta 367 zcmV-#0g(Q~1KNklaJlC?@ZiPobyjqDQB~c*KVR|*s;a{2bn5Q+yQnI> z_Xr_CM4+l5$+m5=-EQ?~$A2y#4hK%BQ>cFTMFj8n8vu}V#&9^45CXjS-Db1VqM(1O zD(v@r&So=^1WBkWQc6X^4_OESs*2;$L zQi7R*r1UJPDnz76AB{#ZGdSlUA{dXyWv*$OGFu2l1SBz^&;OeIa=Ao|u}=^}fSF;j zSoAXR-uG~f5hM{~Bmnd>=(-MO1^`=Vng-tcg4?!5j1kZ06K3{n_w$U`>y?wqq};u( zYs46PcrX~?d_HrvTInAj>2kTSu4|BlbFSp0s&LNncDu=Lw-fw7^#zYnuR$NTq&xrs N002ovPDHLkV1kzqt9AeY delta 338 zcmV-Y0j>Vv1H%K5QV9ea4;~u%m+~Z$TP%MkNklb5vEu&1QcC zk{}6HMT~JuF`9YralKx7JRTJQCMV|{NMaZU06^DuFf*i-KoV`+LPQW_1WEZ?K~*6l zAo+PPLyQq-29j8Db+x<#?zuzN-@NM9|$1n^iiekZFOfc#!%Me1~lzh%0 zr8F^U+ZJZFU=l*W^Z8t?AoDZc?{_|~*X!x_P17KRu+WdkgNMUGfBZWFU8GbZ8()Nlj2>E@cM*00Cb~L_t(I%iWSOswzPc zMNd~x_ly|32wjVT+n7j~VxapF6vV*DT_{EhVj_s*pwrX!gOB|c{s!Kwtmvx4t$Q1O ze3{RtEK3fDL%d$EMnuT64Cfri7(@hB)#vlcdcBtSPWHLH+wHX5?IQB`-5A5;@c3g#CW6%jHs%6l*Q2N(cc} z<$k}Ts?>E&2!ZiKl;LoQ_nvmUjjE>E1Te;+ zs!3vu5$`>d$%N5pL{(LU5Yidm`)?DSb2LqZwU+sOo|2i(W&p$(vDPve4Bl}40$6K_ zF#^!<_j$cu2x}2RaK}e*4pHch+wVN%jIG=n~mZ3)F1v&uYnm`MsENB002ovPDHLkV1kvO*i`@k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/industrialwires/textures/items/switch_cover.png b/src/main/resources/assets/industrialwires/textures/items/switch_cover.png new file mode 100644 index 0000000000000000000000000000000000000000..dc48c7010cf359237e12408f738bcb357649af85 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEKq1-8kcblJ{M_8syb>Unfx)>bHL)Z$ zMWH;iBtya7(>EYRFO?lAuI=gK7-DfcIYEL|gxRg6@jno#ujrgOQE<76BJ+i(Gc~>* eIv{Pp#l{SD6(bKrU4EGj$UIM1KbLh*2~7a%buym- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/industrialwires/textures/items/variac.png b/src/main/resources/assets/industrialwires/textures/items/variac.png new file mode 100644 index 0000000000000000000000000000000000000000..1eabdaf844a72a7eaa2c7b490de20bb9cbc29c4a GIT binary patch literal 513 zcmV+c0{;DpP)WFU8GbZ8()Nlj2>E@cM*00Cu5L_t(I%iWScs#;+X z#eXy3pKI)1;UaVyX|05Gk_Ftwq{|XgS&ASQzQ$cBl0rc&A`!u>-22^0@$xocDuFte6Cr6 za}G13X&R=}>0dn$heN#gn3+6TP*p_UA{mWFm>DT0#^W)Q$t2rSRc^Oip3MXzf|(IQ z0HCgGVvKaVU7T}Se$zA*ML~@5nIMEfN(tv2pMHMjNBsd8JAD80jgKCx8ae@9Up~{e zEipy|(8mngwk4&+Szbs|Ab|bun;8W+E|&`_rEEbS&v-l@t=H@2yH{03jPa>1ih})q zZ?oA<|M*CU!@;Vm!pv~a<$P2X=bW8RCt0ml!vBL`OGcp^W{L-)00000NkvXXu0mjf Dm&?