From 875682b11eb934f2168df73a7d61fbbc51e5390d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 28 Sep 2016 01:40:12 +0200 Subject: [PATCH] Detector fixes --- CHANGELOG.md | 1 + .../refinedstorage/block/BlockDetector.java | 1 - .../java/refinedstorage/gui/GuiDetector.java | 4 +- .../refinedstorage/blockstates/detector.json | 6 +- .../refinedstorage/models/block/detector.json | 111 +++++++++--------- .../textures/blocks/detector_side.png | Bin 1306 -> 0 bytes .../textures/blocks/detector_side_off.png | Bin 0 -> 1194 bytes .../textures/blocks/detector_side_on.png | Bin 0 -> 1230 bytes 8 files changed, 61 insertions(+), 62 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 7709431bd..51af21b67 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Updated JEI, fixes crashes (way2muchnoise) - Fixed crash with Disk Manipulator (way2muchnoise) - Fixed autocrafting not giving back byproducts (raoulvdberge) +- Detector amount text field doesn't autoselect anymore (raoulvdberge) ### 1.0.5 - Fixed crafting a complex item causes the process to flow off the Crafting Monitor's GUI (raoulvdberge) diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 532ceda5b..cb6b634f6 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -17,7 +17,6 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDetector; -// @TODO: Fix detector model connectivity (also HITBOX) public class BlockDetector extends BlockNode { private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D); diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java index 6a2318841..9b4eefd44 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -33,8 +33,8 @@ public class GuiDetector extends GuiBase { AMOUNT.setEnableBackgroundDrawing(false); AMOUNT.setVisible(true); AMOUNT.setTextColor(16777215); - AMOUNT.setCanLoseFocus(false); - AMOUNT.setFocused(true); + AMOUNT.setCanLoseFocus(true); + AMOUNT.setFocused(false); } @Override diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json index 587bd4748..17a4dfe0f 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "particle": "refinedstorage:blocks/side_borderless", - "torch": "refinedstorage:blocks/wireless_transmitter_disconnected" + "particle": "refinedstorage:blocks/detector_top", + "torch": "refinedstorage:blocks/detector_side_off" }, "model": "refinedstorage:detector" }, @@ -16,7 +16,7 @@ "powered": { "true": { "textures": { - "torch": "refinedstorage:blocks/wireless_transmitter_connected" + "torch": "refinedstorage:blocks/detector_side_on" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json index 20ee0a1b1..336ac0aba 100755 --- a/src/main/resources/assets/refinedstorage/models/block/detector.json +++ b/src/main/resources/assets/refinedstorage/models/block/detector.json @@ -1,10 +1,9 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "__comment": "Model made by CyanideX", "textures": { - "0": "refinedstorage:blocks/detector_side", - "1": "refinedstorage:blocks/detector_side", - "2": "refinedstorage:blocks/detector_top", - "3": "refinedstorage:blocks/detector_bottom" + "2": "refinedstorage:blocks/detector_side_off", + "3": "refinedstorage:blocks/detector_top", + "4": "refinedstorage:blocks/detector_bottom" }, "elements": [ { @@ -16,63 +15,63 @@ ], "to": [ 9.0, - 15.0, + 10.0, 9.0 ], "shade": false, "faces": { "north": { - "texture": "#0", + "texture": "#torch", "uv": [ - 10.0, - 1.0, - 12.0, + 7.0, + 5.0, + 9.0, 11.0 ] }, "east": { - "texture": "#0", + "texture": "#torch", "uv": [ - 10.0, - 1.0, - 12.0, + 7.0, + 5.0, + 9.0, 11.0 ] }, "south": { - "texture": "#0", + "texture": "#torch", "uv": [ - 10.0, - 1.0, - 12.0, + 7.0, + 5.0, + 9.0, 11.0 ] }, "west": { - "texture": "#0", + "texture": "#torch", "uv": [ - 10.0, - 1.0, - 12.0, + 7.0, + 5.0, + 9.0, 11.0 ] }, "up": { - "texture": "#0", + "texture": "#torch", "uv": [ - 10.0, - 1.0, - 12.0, - 3.0 + 7.0, + 5.0, + 9.0, + 7.0 ] }, "down": { - "texture": "#0", + "texture": "#torch", "uv": [ - 10.0, - 5.0, - 12.0, - 7.0 + 7.0, + 7.0, + 9.0, + 9.0 ] } } @@ -86,26 +85,26 @@ ], "to": [ 9.0, - 16.0, + 11.0, 10.0 ], "shade": false, "faces": { "east": { - "texture": "#0", + "texture": "#torch", "uv": [ - 9.0, - 0.0, - 13.0, + 6.0, + 4.0, + 10.0, 11.0 ] }, "west": { - "texture": "#0", + "texture": "#torch", "uv": [ - 9.0, - 0.0, - 13.0, + 6.0, + 4.0, + 10.0, 11.0 ] } @@ -120,26 +119,26 @@ ], "to": [ 10.0, - 16.0, + 11.0, 9.0 ], "shade": false, "faces": { "north": { - "texture": "#0", + "texture": "#torch", "uv": [ - 9.0, - 0.0, - 13.0, + 6.0, + 4.0, + 10.0, 11.0 ] }, "south": { - "texture": "#0", + "texture": "#torch", "uv": [ - 9.0, - 0.0, - 13.0, + 6.0, + 4.0, + 10.0, 11.0 ] } @@ -159,7 +158,7 @@ ], "faces": { "north": { - "texture": "#1", + "texture": "#2", "uv": [ 0.0, 11.0, @@ -168,7 +167,7 @@ ] }, "east": { - "texture": "#1", + "texture": "#2", "uv": [ 0.0, 11.0, @@ -177,7 +176,7 @@ ] }, "south": { - "texture": "#1", + "texture": "#2", "uv": [ 0.0, 11.0, @@ -186,7 +185,7 @@ ] }, "west": { - "texture": "#1", + "texture": "#2", "uv": [ 0.0, 11.0, @@ -195,7 +194,7 @@ ] }, "up": { - "texture": "#2", + "texture": "#3", "uv": [ 0.0, 0.0, @@ -204,7 +203,7 @@ ] }, "down": { - "texture": "#3", + "texture": "#4", "uv": [ 0.0, 0.0, diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png deleted file mode 100755 index 8795b017304d4307eddd4d6c870af4b4fa1c0d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIlG#=IhvU`TbQ`H7#g~oIT@H+xHvkQ z8X6lo8=5 zxY2Oi#Jv@1sVrukYqs3__-6L@{Cg1|nuWQY52QVUSWSEtb$?eZf4EKcVIAY^tzG`t za#;d--h4l>o;_!Kdib$kE|z!iRczvq{ui{_v)5y$+7B6f`9}Z8;dZv?gFA1&$!|LT zy}#u3{L^>dmesI1222W5+F-PK@}ZPR7GZvIGa@<<@H@Ap+|WD`V4!%Ul!+;GR#~9q zB$ex&MjNJyi*R=R>}HvL_StfdGk5tnfAi{MZ*I&noBg3yK66%D{i>5`TcdQ#<`!Me zn)=vlX_H3R4%btgnUdaq|D7YkSQ6Ww8u=%RZxK_FtEJNVt64U;e%A0ccjeqZmbB4f z_uXSDMv0p_JW@jToL}a2Duch>S!cTUmnvHmDPD=MRdZF#cE?)uHDAp-I@y5tYFA#y z&C`Oc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIXgO=7`d7|TbLREL*CWQ(GbXWvoNqQ za<(+HG%$kcb;(aI%}vcKf$2>_=yk!V7nB@w3xGDeq!wkCrKY$Q<>xAZy=|3=+bxbb z&4cPq!R;0&oO<dK}gn%gs#DphZAP1iKQ}ci+z6hAKbvFH<&cMJZ<>}%W zQgQ3fB-^ak0D;#2s=w?<|D}pA%2QZsy|FQy9J9~m zBb#)d8%rD)ylgU;{lb_1|3Wl9Cmk-7`BK|odw=07t?roXM-6ylE|<=|KWkayyz~>B z&Xk^O&^cDfqsU^e(ZzJw;Kr|fVa^l0S2_G{UZ_fqbeeGDvrR}S>;3N&pIdIreeBjW zu_89S%+1_4_)2N7MpwdZvzFAz977)GnDyZ%zRaGJ7Ie)I6;Zsec0NYAAW-DQrk+HW zX-x_bcwTJFJ)LJUXLduF0te^I+4rW1@~SfI-Onn)aAb4;BA!W;w}MI!Pgg&ebxsLQ E0M-YbX8-^I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png new file mode 100755 index 0000000000000000000000000000000000000000..aa99a17217a9fba63a837b5bf3c4daad66626faf GIT binary patch literal 1230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIh(p!n!6ghS(q9CL*CWQ(!#~U($LY( z(cIA0$->zPrq?AuximL5uLPzy1+Le~0Hy+J+U$~Alv$RV;#QQOs{r=4RVHq? zxZpGosy79vTMS)s>eUB2MjsTpNRbT_0;V7k6P|Q|9C+eS%>$EaktaqCEsbzZZB$eh-r$09blPL*Lvj6Y<)pwMxm@shKmI^Vy!-r4m@*C%Bu*NpWE zhi#@9b#-*F*>danhqQZpwy*9ntVoHhDEPa-;or;lQ}zwpq}iTWoZ9g(gPrZ9b-`}l zk1xblNo7bqFlK%C{iE&%ZX0{aB{v27MJp<6CmZ`-X0(ty&MD%mm_F}${qELX>)Jj4 zeF_Q{aZTG8p>W!$B=-9K8OlqZ7HMAX^j#j@sXm!=)vBh{$foY*O*$KI<}BDcjpg>X zhr9GT>eVMYxF6B5n|*f4(aSGcd?&sCZ885mM-#*EzjC>^y_Al6