From a5bad4c9cbee438e2a1beeffbd97de03589dcf09 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Fri, 24 Jul 2020 18:23:09 -0400 Subject: [PATCH] Add New azazelthedemonlord Textures --- .../ForcefieldProjectorBlockEntity.java | 2 +- .../block/forcefield/ForcefieldBlock.java | 2 +- .../energonrelics/config/HardcodedConfig.java | 2 +- .../textures/block/forcefield_projector_off.png | Bin 0 -> 569 bytes .../textures/block/forcefield_projector_on.png | Bin 0 -> 573 bytes .../textures/block/forcefield_projector_side.png | Bin 0 -> 475 bytes .../textures/block/reactor_input.png | Bin 0 -> 559 bytes .../textures/block/solar_panel.png | Bin 0 -> 588 bytes .../textures/block/switch_off.png | Bin 0 -> 557 bytes .../textures/block/switch_on.png | Bin 0 -> 578 bytes 10 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_off.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_on.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_side.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/reactor_input.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/solar_panel.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/switch_off.png create mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/switch_on.png diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/ForcefieldProjectorBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/ForcefieldProjectorBlockEntity.java index a4461f8..4959c11 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/ForcefieldProjectorBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/ForcefieldProjectorBlockEntity.java @@ -29,7 +29,7 @@ public class ForcefieldProjectorBlockEntity extends EnergyReceiverBlockEntity { BlockState targetState = getWorld().getBlockState(targetPos); if (targetState.isAir()) { getWorld().setBlockState(targetPos, state); - } else if (targetState.getBlock() != EnergonRelics.FORCEFIELD_BLOCK) { + } else if (targetState != state) { break; } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/ForcefieldBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/ForcefieldBlock.java index 38ca7da..cb6b06a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/ForcefieldBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/ForcefieldBlock.java @@ -102,7 +102,7 @@ public class ForcefieldBlock extends SimpleBlock { @Override @Environment(EnvType.CLIENT) public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) { - return stateFrom.isOf(this) || super.isSideInvisible(state, stateFrom, direction); + return stateFrom == state || super.isSideInvisible(state, stateFrom, direction); } @Override diff --git a/src/main/java/com/thebrokenrail/energonrelics/config/HardcodedConfig.java b/src/main/java/com/thebrokenrail/energonrelics/config/HardcodedConfig.java index 3ac9d87..7676129 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/config/HardcodedConfig.java +++ b/src/main/java/com/thebrokenrail/energonrelics/config/HardcodedConfig.java @@ -30,4 +30,4 @@ public class HardcodedConfig { public static final long FORCEFIELD_PROJECTOR_ENERGY_REQUIRED = 64; public static final int FORCEFIELD_MAX_SIZE = 12; -} +} \ No newline at end of file diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_off.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_off.png new file mode 100644 index 0000000000000000000000000000000000000000..dc26b3a186f26245036d3998c9003ddaf98ef6f1 GIT binary patch literal 569 zcmV-90>=G`P)0v@6g_#LlSJAgl;W}*aUm!OZWa6kA}UC%7UEJUKVqF}U)=Ff(`V+&SmmJFT0y?lf4iGi%W{MjX24{IB`i!+Vc}{@rJf zF+MFNWZvK$Hy{9NeWvOGBY^MjXb1u=obWp&WzN; zR+R+&C_OMf0-_9P1J_nB2m*b~P6|mX8Z4h*5*-NNmSq-~)>8xDqY zxtY~-1f-yX6h(xG?C=4kO3Dsui>+9=6hnkrDk_6Mw*a&%eDAAI!1DREYa+Q+`=vv`x z38{l1;EPmM5j@;@5R~q}c^?`_&$Tnnx$ay8X{1Sk*RT4b1zVU%7_`0fM20pSlQ1zW zp_WKLrx|u%YzHd(i55SO8k0PKxfAxSD_3tc+G#rfw*mMAko`Cn!dni-00000NkvXX Hu0mjf)tCE@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_on.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/forcefield_projector_on.png new file mode 100644 index 0000000000000000000000000000000000000000..76d2e2a22bf14d47393c88d48fdb126b2234fb1e GIT binary patch literal 573 zcmV-D0>b@?P)~CN)S8?9`)eCn}UBp#0avQNQ{R>MZNeF`~#wb*(|sa)ELy?B6t?P zNignaGqW>2U-BwcyLhr-sP5|O>i1sNbS_`H)?&t{d5$A-ECF59|7&$sqpoWNjIZCn zgYhJjl>Kpv$b_&(iMja%d2S`ny~gQjZw6cNxcIp{LjUzpl6g4YAEPO)?0JFTY>~mn z5OEv{0*~;xS-gG~MV3pFZ@Tcp2;1*I;_cQp+PapHh-fSKmK-vnz)i>ZrTWhMPmZm% z7D>{@hn>%kbFX(p&P+E(Q5F$@g@k|a)EDtFi#svYPvm&*~ zi$W3>9=||4ZO~>V%$Wqc&mIW^eJnpnrKo5ye_~E_ApF=Esm#k47tbQOa15az2^HFK zFqF$}Qyn581r;PsGx&iom7~)UzI^?T={Jk!*F?@37iwWd9Dfmz0&RJv=eU=@D^#Nf z?T-}RNh1gtzrEZ;U1ZV~*98hg3PeJ+S$VSYROnC>dK%-*^63Fv9x7RYygCqS+rujYS?jS#$f&x$~D=oiz3TZ2Gv}Uja%1fu993e(EJ zfl8nultA}k9sv<{tKCQuX)6O843;IpL@18i(kejBAqugfoa;?>$~>C zTpfl4Hb5g$8So}t3zV6HNYH%3WL$q@7k3);a3ZynGQBaG@n-s~o!SF+e>{9pvai8IC|MsGh!k@_eaZDyRcUMhq?d7 R=8XUV002ovPDHLkV1lSG$%Fs^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/reactor_input.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/reactor_input.png new file mode 100644 index 0000000000000000000000000000000000000000..f5cfaebd89f5a9001fae04fb80ba4a971ad30ea5 GIT binary patch literal 559 zcmV+~0?_@5P)+vGIi~rZGv9Q)c z%l(5JANbjfn=Z`O7I7ALK3F|%(V7Tpzs21*%TVFNo!95PAYG&#NW6d~kv!Q@;oiFo zXiDW3h&*8)U3o9z48pkiOMy;7fLIEP(WQ@QtJaeRRtZ*FjPyO=C znAwZ~0ZXFOXBWxXfwP!rC5)lNk|fqKCVM}5e)?<+kDt6^f>5)N$ymjAQ^<=5K;-9b zEc$~XhNlXwt*s(SGX^dU`eY1bjfsw$SdASUBO4}-+Sq*Q<>`ce-Z%wePXBmeWCNMe zanAEWp*P}X3vKO?oyoa;Bq6wJxt?a~x(%buQnBktU{7}Y`4Y?Z3asT;2{WL&8HazN x-l@3C^FP(b&CiS#i!Lr-b)nYdYW}YQI0UFmI!)A)O0oa|002ovPDHLkV1lFG2Uh?9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/solar_panel.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/solar_panel.png new file mode 100644 index 0000000000000000000000000000000000000000..44f25684bfe79417f2213b7cbf8aab6706dadd93 GIT binary patch literal 588 zcmV-S0<-;zP)5PiG1d%3+c=ozp`iV!de9vTUP!WI#1t;E*aN)d}7HvTA5h9EYUVj=eV7eZ15 zAwLWRgb*cX;}PZD+q?a7EAQ=od*LcSSY~JDo0&In=CkhHy`SOC3HyC`wHn54<0nm0 zq-hF=cK`Dy?0!Ag6~8r$FB?a2F4*Y4d9L7#%d3b_6WqEtFCYKCxhj4xKh6`F;NS`3j`dGHF==_*Vz(tTlsO9An&`O(sfS zUuw$ENr?mQ^yY_s^~T=!aDw2lE9ch1VKIROY?|zIjGNp0`F3&&f)ga#K3+CU!i3cM zCfJf$Ws*rBV{!y(s+qGV5(yt#7`}`4%SXC2{rbHUSzSkDMmu4-6V}3wrHo_NklP-v@#`v|K=TLmF;7yS@Sc!cRft404oe?ibHC=(L=4_vgCc0ob9 zED|(G+Vm`+GjHy_6WFNfPOw=tQQ`zk2vp;zV_MA0|rVEK*T8 zO3@?FWn}`#)@-3x{xrE3QC}bv#>X$iSzAw`*}~Z91@XzY^i}bQw5ci?@PTm7=g(b~ z>O@l{^}CB*8DV;+Q)!^8GI3#H4tM5nA~2z}rEf!xAQXJ<*-I>~+&g99oT$3`aH(!Z vf1>7((=77f(Mr7!CN52uO0h}xzYM@HwGc1yVK+TU00000NkvXXu0mjfr=|(C literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/switch_on.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/switch_on.png new file mode 100644 index 0000000000000000000000000000000000000000..c0c99bb8fb9e896978eb3fdaf7e8dafabceedd1b GIT binary patch literal 578 zcmV-I0=@l-P)1sYf+#zUeW{0II5!Baq!Kmz`Q9F%~E zAR-C|lHf^E(2IC+quI>tO!vsE*&0Vr77X20(^d7}t8Q<6@=}h99mFvjQ6vG~bN$zB zW?`*G!1%(Qo9O)P%8|X!KI&l&y(GoJU<+~FlQ?~ibEU1WJcZ%r+xH(>db}ow`SW0} z1DE#1X9B-!k(DQFh@yIdfbi&Cy>byrH^%zhy&v)WcBxQ?I8m`s%#wqecVGR;z4Ajfg-r7#tdqA4HR-DV%dS{bm|lXEy`| z3%xt@yhIcK+DGm(K@c!W1z|BBGX0q|nZ<;!a}pQcwK{S9K|l&&GZLl4FckjV=Uzx> z+WU!3fzLR*+N28;6f^@Bg`*Tbl0;S(A_W@NC$&=fesU?I-ayWIWMmXJ%gQOJk;3rd zV@2_1gxuKz0bx^BBH#t#oR1zkF4fshJL$eX+m;bVhgyXOswxv_X0GAJ^~>;#FSPV- zsIdtJUs_zo-2AOR0&7Lpg?n=)6@5h2hf^(b_x^n8dnZng