From 981d2ffb6f11879b4941adb5fb078cecbdf9908e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 8 Dec 2014 02:10:07 +0100 Subject: [PATCH] Some minor tweaks to some block textures (had gradient in border). --- src/main/java/li/cil/oc/api/internal/Case.java | 9 ++------- .../opencomputers/textures/blocks/CaseFront.png | Bin 623 -> 634 bytes .../textures/blocks/DiskDriveFront.png | Bin 570 -> 528 bytes .../textures/blocks/DiskDriveSide.png | Bin 534 -> 534 bytes .../opencomputers/textures/blocks/RaidFront.png | Bin 584 -> 580 bytes .../opencomputers/textures/blocks/RaidSide.png | Bin 522 -> 466 bytes .../textures/blocks/ServerRackFront.png | Bin 558 -> 514 bytes src/main/scala/li/cil/oc/common/Proxy.scala | 4 +--- .../oc/common/block/DelegatorConverter.scala | 1 + 9 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/li/cil/oc/api/internal/Case.java b/src/main/java/li/cil/oc/api/internal/Case.java index 0da398eef..83fb9330b 100644 --- a/src/main/java/li/cil/oc/api/internal/Case.java +++ b/src/main/java/li/cil/oc/api/internal/Case.java @@ -8,16 +8,11 @@ import net.minecraft.inventory.IInventory; /** * This interface is implemented as a marker by computer cases. *

- * This is implemented by computer case tile entities, which also serve as its - * computer components' environment. That means you can use this to check for - * computer cases by using either: + * This is implemented by computer case tile entities. That means you can + * use this to check for computer cases by using: * 

  *     if (tileEntity instanceof Case) {
  *
- * or - * 
- *     if (node.host() instanceof Case) {
- *
*

* The only purpose is to allow identifying tile entities as computer cases * via the API, i.e. without having to link against internal classes. This diff --git a/src/main/resources/assets/opencomputers/textures/blocks/CaseFront.png b/src/main/resources/assets/opencomputers/textures/blocks/CaseFront.png index 545d79859fbe01a3e2fb97af05f18427d8abb913..5da1148c336d94bbc4783d230f499abb189a1319 100644 GIT binary patch delta 572 zcmV-C0>l091o{M!Nq-{0D@saA zBqSs$DJg7hY&|_aA0Hn+K0Y})IZsbdRaI3lFE1S(9Z*nEYinyeJ3AQ}86F-UXJ=;^ z7#L1YP9h>AH8nMAYHB(zFRx>j*92^{O zZf;>=VPaAVWh# zNl8f-78X}mR)0oDMsjj;b8~ZWaByj9X+}jxI5;?3T3S+4QdCq`O-)Q*US4B}Vxt=U zs{jB1@JU2LRCwAHkVSUHKnz6HX!e-d9%h~}Gc$8?|68Q3oun_lssbnrBMKS-)yl?T z$Gw}sYv+}%t^_Xt$nc&`RaK?2r7nVwAZo03))SLSEI;|Ov|JI zsmzahr0DW#%GVl#;P}+;6LQDvyRxicKrMZ8I49(Sw|-A1OM>_Wxz8%T)tn8f*aLk; zgKcFrs-HJqci;*gL9xO1uKbU0&s*1oRJ2c=9URBYTea5*)?z>-AnB!VYKTLy?DsjyADYu5hqC4E)&312a&?R00RJ}$QfNvAr}`H85tQE7#JiZBv4RLR#sLT8X6xTA4y3` zEiEl4CnqH(B~DIGN=iyDE-oV@BOM(bA|fJ3M@L{_U_3lLC@3f@Dk?fUIyg8uXlQ6D zDJd%}D`sY9X=!O28yg@XAXiscEG#T)YHA!D9BXT9FfcG%TYp<&VPQ*4OH@=;FE1}W zJv|;C9%W@^TwGjaWMninG&MCfZEbC0Vq$D;Z8S48TY*|xSy^C(Uv6%0IXO8}Qc_x4 zT4IJ_aBy%bDk?HEGDk;9F)=YlMn+&^U_U-TGcz+C92{q7XI_I{O-)THDJoA-Pd`6D zUS3{oY-~0*Hh)7xLPJACa&mGcBqL#9VK+B7adB}wIy+&7U{O&~jMe_X0002)Nkl?hY|Z#BpDL3^P)gYv33Jv4pcLwJ1;zae!4`uz diff --git a/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveFront.png b/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveFront.png index 84dd4cbb0a2213ff3815e385ec6097b06351e20b..0791e3e7928872c512aa9be35d2ccf3ffd52b5eb 100644 GIT binary patch delta 465 zcmV;?0WSW!1ds%fNq@{xOjJb~85tND7#9~8H#au`001;JG#VNj9v&V#Iyy5mGbAJ= zJUl!(IXMv#5jHk9NJvOWM@K_LLmwX>I5;>&L_|(bPBk?(2?+^8LPAVTOdK2>F)=Yd zK0ZG`KSoAIJv}`Y6%|lWP%bVmQBhG(Pfs8qAP5KuQc_YdFn=&pQ&T}fL1TboIXXFG zfMZovRZUGzFE1}8B_$ml9XUEW8yg!G6ckHKOD88MKtMo6MMYFpR904278VvVGBPtV zGb1A-5)u+hN=gtA5G^e&#?MIr0002mNklTH-%%Yx0=KzxC^xQYjmbNKNH{gyy zP5I&0R;}hhZi6<|2*W6) ztR_GhXYWSVG_ab1#2lTJtn1|dquxt~fFyW2egJ^S{wKfy5nT}DFi&9Y00000NkvXX Hu0mjf05D*v`7!MB*I5;>F5fK0Y05>-`7Z(>985uM*G(9~% zJ3BidARt0QLLVO=M@L6BH8mq6BRV=dKR-VQWOG`^rQ&VGqVGa%sQc_bD6%|KFNJ>gdCnqOHMn+?QVnjnkJv}}$GBQI$LN_-y zR8&-R`9rV(0Dl18Nklu6%5CzYYDqB(%S!ND%%8V&9{r}hWJkz~*voi}$ zi|2X{t`&G%oBrhP{I{Q`&5d!uolPE7hRoUQXy*b$4}ih`_Q3|_rEVLNt$);O&xP{E zvGr80Ka=H^UEY@PWSZi6T3c)Dar0(M$o2jEw>HCKsC37L33JFPKiyj#h9A43rZLYT z>mc3ZZU+yS0ZXJ*QY}{DN}jCc92mV0;)GJAfHQ10g{05fu3oU;q>96+z^P#pnP4002ovPDHLkV1f;zv}*tW diff --git a/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveSide.png b/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveSide.png index ede2cbf223726d2db62c78d5bafe0e5ef4c8d96b..e1234087c8fe4e0a3008a44dcd891e3857d2959e 100644 GIT binary patch delta 471 zcmV;|0Vw{K1eOGlNq@{xOjJb~85tND7#9~85fKqiPEI;HIx{mf8X6i%NJuv~H#|H% zK0ZE2M@LLdOhQ6J8yg!$L_|3`IX^!?N=iyLHa1I3OA-uGQ&UqSA|e(R7Ew@9Jv=->KtM%BMi3AXMMXtcR#r1I zGe15*OH4}*4GlRuIvyS#-`D8!0002sNklmM0b!Y@<}B>#X%9fU_wG5_)2gIpG*PrT zW;r>7^PN=3ZgK!1X$tWsqN<3J;^-IvcH;|MtnOFQN3paq)NSmAYYShvzP}7HBj1Ml zb)grR&~+aNwA93xJv`k9If|F_k4&-+o#4=`a zCZ*(80wgmzc--?^?s2g2u+g%zakS1~*Rz!&AO^0UKL8#WPXPY{3;+nW5|GU0;N<`S N002ovPDHLkV1nGSs^$Oy delta 471 zcmV;|0Vw{K1eOGlNq^5!OjJb>5D-57#J597e_}&O-)T492`A8Jwif4 zG&D3gI5-&@8B9z}J3BiP5)w#ANE8$l4h{}FIyy#1Mj9F#N=iyjPEHdO6G=%)H8nLu zLqkzfQ9L|6H#avYCnr!)P#YT?Q&UqN9UU_>GgMSmHa0dNAAcV}KtM%BMGXxNK|w(! zB_&T!PfJTnL_|a)A|f#{F+M#$ARr(N3=C3IQba>UKR!QIRaHkwM-~OtY1XnT$ZCPeK!!ctR zF7*F5MedrN*?(%VM?A-~O~wI_kVVr^9~TWF&CApVCl3N^#B@LpM)=_O*@5Vs?S8`FuDO2soq;{rfE#I0;q zTS+O0I{++$G^Ht}vw;q&Fk&u5HUAP9vAl@N2pnMy*c@08ng3sa0RW=Q6cGHUOX>gs N002ovPDHLkV1iP1jGc8Nq_cGOjJb}7#JBD85b894-XGNKR*r*4iOO%CMG5j5D*+398OM7 z4Gj$?B_%aAHAhEB8yg!M8X6=dBtbzzBO@aqARrzd9xW{`D=RAi001{PH!3PBOiWBd zLPAnfQan67F)=YHC@2#X6E-$BGBPp@3=9hk3qC$RA0HnsE`Kg3Cnq8zA{7-CEG#TU zSwdA+Ra8_|QBhGoQ9VCXJwjJNDJm%z78XTYLr+gn5)u+PI5GCj)cMFhGbfHI%t@Kslo|j3nd&r>c4kLf z0f07Q5J1-eM5#@+xBcE!N>!Iz0OOQ%+Y+XUu}tr=BF?=4z~kqx`00000NkvXX Hu0mjf^TM*} delta 522 zcmV+l0`>jG1jq!CNq_uMOjJb>5D*U!4;UC24h{|x5fL;rG#3{a85tQA6ci;TB@+`9 zO-)T8ARsX@F&i5jCMG5}Ha06OD;gRa4Gj$^Cnq&EH8V3a0000L6%{QlEei_^EG#S| zBO^>qOdTB^QBhGTDJfJ`R6$igM@L66FfcAIE;2GQH#av^Q-4zu5)vvZDmyznLPA0u z92^V`3?d>TI5;>%S3w^iA5~RVJv}`kAt6FnKqMq2FE1}dSwbf#CO=a?78VvaHaAdE zP%bVnPEJlhRX;j9IzK-@OG`^RIXOR6J|`w8K|w(_H8nj@JW5JRC@3gAJUllyHa=24 zQc_YL9v)9mPk%j6JBTQwt^fc4;z>k7RCwAHh=r1bFaSeS+5*LWu?5!c*3RAC<^TWX zN+xfTc~IJDs;0=c1I;vh_2u-tSDR+NH&visQyMx9km%K~6y24fa43P-VyaSvC)*f@ zeNJw+FI^SqZ~5QXF?~FD!+(JeeP4PZeZCJ|j+ z2)dbwPXJyej2<@|i>JtlRo!ePw xVK~RpnEv=`2D1#NXG3W|Egt}^@K=BV03cNjD!WSW)C>Rs002ovPDHLkV1hkzmvR6A delta 459 zcmV;+0W|*71BwKYNq@{xOjJbx000mW5DyOz7#J8A7Z)HPAQ2G}4Gj$$85t515*!>H zA0HnyG&CC<8xs=~Jv}{5O-%|43K|+3KR-VR2nZn|Awohz3=9ku6ci&PBRe}g2?+^N zQBf8a7C}KlOiWA$1_o4AR5ms?A|fI)Gcz6@9wa0rQ&UqwKz~3dCnrZoM=>!mH8nLp zJw6>B9ZpV86%`dcJUmiTQaU<1P*6}+RaHYoLqkJDB_$<4K0iuIN;^C}Pft%WGBP+g zI6gi;OG`^PH#S5=L=FxP%kOFl0002gNkl({Q2n0y8ce?jV z+xLH`$~n4{K7XBGf@=wR=u+%Lm?YEgVSP94lB9cFyWrPC_!gQ%evp_rFjo+lY!hyU z9z%{17SP)XNB_nO@WS3%@pA5Qvt#g5M5&$gU5`=4o3dUl6Q9uX}gkBVa8-^Otpx0_>rjNiXw0skuq>Y%Ozi$u9MaM~I=#gcwWp?@4WGm&L7 zlk%jc&J>A-QisK-+N;@K9Z0Z0#vDdX&|?1r3;=H05(gf(wFCeF002ovPDHLkV1lWa Bn;`%I diff --git a/src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png b/src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png index 5e0ffed788eaecb7e7ec97affadd8a2b7fd93eb1..68c2f3ae3d80b62c0c3711feeb2f5e27586f9284 100644 GIT binary patch delta 451 zcmV;!0X+V$1cC&RNq@#rOjJb~85tND7#bQH9v&VhCMGB-C^IuN7Z(>B8yhDlCnO{! zH#avUBO@OlA0i?m9UUDsG&C(OEhQx-PEJlSF)=VOFj7)dEG#TCGBPeME;dLuRaI3l zJ}y*LR6kQbI5;>&Swc28HXtA%D=RB9Gcq?xHaJN(Dk>^FO@BHwGBZ6;J5f3{{N|)wMO>H z(jZs{3NVT+K!4NB`-|oCyl`>4 zCj?3W)YEp~Y5g_TH3b>&{B#xE?VEGIAvmCjA;cJ5bdh97JyIHmG#-s<_`4oc0hGtH zgAg|}v3n7vpgk%fDp8dL;%rEztdhh^omj=es)zf9F+AT3ZoJ`!fpN}3nYrYKgVP?Z t)^*$J?(Cz}wWeDN8l67?@XY@L3;@4y4$?xU6k-4X002ovPDHLkV1oIpq3-|y delta 495 zcmV-Nq^)}OjJb>5D*U!4<8>NCnqNu7#K7(G&VLiDJdxz7Z)ZbCL0?Y zBO@am92_JhBpDeQ8X6iQAt4?f9x^gAARr(!Gcz$UF-=WP6B83CC@3{GH7qPFB_$;- zEiEDbQ9L<0 zIYnDUE-o)GE-yDoHat%|I7v1?Qaw^qQdLz|HAXZ(Qaut95)~B{u*Ep40002sNkld4L@l&kU6%Dl`Bs-*_h?#YkVQ{NpD6f#N6|HkPzK9j zIt^}u2pIx|eqo6j%NaJ!*jdgpfX#fqmHc+g "special", OpenComputers.ID + ":" + Settings.namespace + "special_redstone" -> "special_redstone", OpenComputers.ID + ":" + Settings.namespace + "keyboard" -> "keyboard", - OpenComputers.ID + ":rack" -> "serverRack", - OpenComputers.ID + ":appengTunnel" -> "oc.appenTunnel" + OpenComputers.ID + ":rack" -> "serverRack" ) def missingMappings(e: FMLMissingMappingsEvent) { @@ -118,7 +117,6 @@ class Proxy { case _ => missing.warn() } } - else missing.warn() } } } \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala b/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala index 99eb43fde..a28736bcd 100644 --- a/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala +++ b/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World +// TODO Remove in 1.5 class DelegatorConverter extends Block(Material.rock) { NEI.hide(this)