From ad4d418f7817321fad17e34af602106dc5e55f69 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 5 Apr 2015 10:39:42 +0200 Subject: [PATCH] more zone plan changes --- .../textures/gui/zone_planner_gui.png | Bin 615 -> 1438 bytes .../robotics/gui/ContainerZonePlan.java | 4 ++-- .../buildcraft/robotics/gui/GuiZonePlan.java | 18 +++++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/gui/zone_planner_gui.png b/buildcraft_resources/assets/buildcraftrobotics/textures/gui/zone_planner_gui.png index 1f365e2c73f89409ffb75a9e984e6fcd69f06549..4146b79b70f8f1b7bafe28d25f8e4673042cd6ba 100755 GIT binary patch literal 1438 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD+3&NkaEtL;D+#+XFtBQSx;TbZ+Zp=-X_VnM5>mnDg)kvJUQG9OwHWlI06#E;(603f!FZseMe9pt8!o?0X-hbGYg=ze$KN{n`04x>KNsr6FJoX~ z5MWrKvU(%?_SAx+jl*m-FQ87*0Y7I-&a0=aN~S2H^ViM zXF-}CG}k@ap2x(%>Yk8#N^!k#-R`^d?r(U^#ZbV?;9c_5$3BL)=GD#nq6{fAEQ}25 z`xzLR7&sUd7!IV=@p4E4?U}VqkU=BR>*dmqDI}GRb3nSaJ16b7`#m zWs@{cFCGUkO~2)nBbl}{I0S|>Y|q(#yQ3rH_P2@otGQ;~zo&RiX+1;Ri&CWYg(I*x zeVyp*INi!`<^TN0I?pZEDlK~d+fM0Ge=qZ!3}d@K*~T8@l1%SAzEZaF4M&R1@s*|w8gmK6 zEB37MIruxm+0c*ganIUN&I7X}oej_V z_a}!Z!2OGo&>N0!R2JYkaDVBPxJ@sQ1|4VI4srqaZq@{;Y>i_l6XzH%-p#~(x_GDd zhG>QjY``2AaOCO#1X01z(9qiJrS&!(QwmuFa?PYSGqwT)L{Koa^y~Y*D;t$UfXw>R zOX2_RKj>eNuYa{`wteR2n<3AnKYhL=&b0RW>-&ixW--k;E9DUK|1STXnq~XGzwSG} z_-5-)76uIihVOQZ?W+bGeUZOe^q@yIrFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?JMAJPle>d?P&y}s0netv42JE;Xe|8JQGj5pl8Sx36pa4S! za*W$Wua|8+mmxCY_}gRuR!>)D3|zwcBv8bgu}&%UHtQ!t1_p=lB8L~*e%hi7`nma_ z+6A-{e$+a!DhTJPPq}wo`s#P%KbIe;nXWp%`a$WQhvzR(0di!ZY7?{@6sO1?la@1h zx+9X;U5N=QKB2?I1?C!|i)UQ6{JHaSvL1s1`-CpALmO-ab=hV_F+6EF8f5r?8MkDC zUv9arwzlc-2~2;q<(9smVRG7Nf0y>@n*N$u3)l{%>NAzhW(#QLd;#+GL#7?V|9%;9 zi5vhXj00&5)1MVaRzopr00tb^ Ay#N3J diff --git a/common/buildcraft/robotics/gui/ContainerZonePlan.java b/common/buildcraft/robotics/gui/ContainerZonePlan.java index ddabc09c..4e0c27ac 100755 --- a/common/buildcraft/robotics/gui/ContainerZonePlan.java +++ b/common/buildcraft/robotics/gui/ContainerZonePlan.java @@ -39,8 +39,8 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe map = iZonePlan; - addSlotToContainer(new Slot(iZonePlan, 0, 233, 20)); - addSlotToContainer(new SlotOutput(iZonePlan, 1, 233, 68)); + addSlotToContainer(new Slot(iZonePlan, 0, 233, 9)); + addSlotToContainer(new SlotOutput(iZonePlan, 1, 233, 57)); // Player inventory for (int l = 0; l < 3; l++) { diff --git a/common/buildcraft/robotics/gui/GuiZonePlan.java b/common/buildcraft/robotics/gui/GuiZonePlan.java index 633a57af..7885bb1a 100755 --- a/common/buildcraft/robotics/gui/GuiZonePlan.java +++ b/common/buildcraft/robotics/gui/GuiZonePlan.java @@ -39,7 +39,7 @@ public class GuiZonePlan extends GuiAdvancedInterface { private static final ResourceLocation TMP_TEXTURE = new ResourceLocation("buildcraftrobotics:textures/gui/zone_planner_gui.png"); - private int mapWidth = 200; + private int mapWidth = 213; private int mapHeight = 100; private TileZonePlan zonePlan; @@ -146,7 +146,7 @@ public class GuiZonePlan extends GuiAdvancedInterface { savedButtonList = buttonList; - textField = new GuiTextField(this.fontRendererObj, 74, 125, 156, 12); + textField = new GuiTextField(this.fontRendererObj, 28, 129, 156, 12); textField.setMaxStringLength(DefaultProps.MAX_NAME_SIZE); textField.setText(zonePlan.mapName); textField.setFocused(true); @@ -168,10 +168,14 @@ public class GuiZonePlan extends GuiAdvancedInterface { protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { super.drawGuiContainerBackgroundLayer(f, x, y); - mapXMin = (width - getContainer().mapTexture.width) / 2; + if (getContainer().mapTexture.width <= 213) { + mapXMin = guiLeft + 8 + ((213 - getContainer().mapTexture.width) / 2); + } else { + mapXMin = (width - getContainer().mapTexture.width) / 2; + } - if (getContainer().mapTexture.height <= 200) { - mapYMin = guiTop + 20; + if (getContainer().mapTexture.height <= 100) { + mapYMin = guiTop + 9 + ((100 - getContainer().mapTexture.height) / 2); } else { mapYMin = (height - getContainer().mapTexture.height) / 2; } @@ -202,7 +206,7 @@ public class GuiZonePlan extends GuiAdvancedInterface { GL11.glDisable(GL11.GL_BLEND); } - if (getContainer().mapTexture.height <= 200) { + if (getContainer().mapTexture.height <= 100) { drawBackgroundSlots(); bindTexture(texture); @@ -338,7 +342,7 @@ public class GuiZonePlan extends GuiAdvancedInterface { uploadMap(); refreshSelectedArea(); } else if (carac == 'm') { - mapWidth = 200; + mapWidth = 213; mapHeight = 100; getContainer().mapTexture = new DynamicTexturePaletted(mapWidth, mapHeight);