From 379ea6e278f74633ae323493ec1c95f5cb4b34de Mon Sep 17 00:00:00 2001 From: SpaceToad Date: Mon, 26 May 2014 23:00:01 +0200 Subject: [PATCH] fixed style and removed unused files --- .../buildcraft/textures/items/board_clean.xcf | Bin 873 -> 0 bytes .../buildcraft/textures/items/board_red.xcf | Bin 996 -> 0 bytes .../buildcraft/textures/items/board_used.xcf | Bin 956 -> 0 bytes .../core/robots/RobotAIDirectMoveTo.java | 2 +- tests/buildcraft/tests/GuiTester.java | 24 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100755 buildcraft_resources/assets/buildcraft/textures/items/board_clean.xcf delete mode 100755 buildcraft_resources/assets/buildcraft/textures/items/board_red.xcf delete mode 100755 buildcraft_resources/assets/buildcraft/textures/items/board_used.xcf diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_clean.xcf b/buildcraft_resources/assets/buildcraft/textures/items/board_clean.xcf deleted file mode 100755 index 5d7601b7f13f1a07368c0964daa538648642e052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 873 zcmZ`%%TB^j5S`&!T0o4Cm5c7g1x9{Bzo09Zrj)iesV!+Sk(Dtn?$+-$k?R?_mq5fx zrgJhg=WseS&0ZG%Ta@@omdAt`nG}4AWX9tR>D+%2Ng~dXEt8j~%H9R`uTV!RWGC56 zn8uT|%I0Vh=1k*yxyoa|F7s@D@;EGR7ey*-4S66sNV&U4ItB};XD|xM{bfhOMOy6b;r<>T?BNq&(Y4V9 zuzdTUTQ3+j9?YWkkKM-OVXv`yfibb_Q&YLrR$X#bi#)|NR6i6bS8>3!4wR$T0W}46 z1hoYhel6#sH+`nX%EZS^a~r)mOB6d diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_red.xcf b/buildcraft_resources/assets/buildcraft/textures/items/board_red.xcf deleted file mode 100755 index e44ed96c016e9a56cc4da52f076bcd78aebd5ea4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 zcmZ`&Jx}965S_7&V-h}faMcy=Fhvmj1^$7XqeRKZHkLvh#UXQsu4|-@ z_oO<1{5_D=*Lpru<*bPBTrZGs`$)?TUuNYpE@$c~t0lk6^Ez984k+3GQyud)RqnwG z|8WS`UAo-i>9`s#CXX+5Ho2M43W@UM1qq>Y?FJfIEGdT;!;oCR#EA5v4i9$l(GEV| z!Kc7d*GUh+<-1SrW`WDQw}Eba#CpHKa$YXygjgSuulsbMd*ta&qZ`dS00pQUZdfz; zwH)N}^#`Sh2*r^yHK}#Lo03nhINL^hx=raojy~cddPiKEVsTEdq${HH@p2;M)~@Y`Y?(>k8w#KF~&y!U!;=ScS9}AWwin z@e_oKF`q1Dc{scBaJCAc+m^?oU3vIjc`RkHl)+M_N0A9=V3&{XC z8TVO<*G{VYX_-&TO|<|e$g7Oa_Gy`?re0QytKqmP=k>DQq~rFQY|7a*y}7<=Z4bEh zsVlV3_Oyn4`hURIN3)*Jt5uoa1}%_J`$*4C9#+*htyc4IxnX}@6ei!k4an|)sg8Ny z$~}0~p8??xOXm(xXZ3Wm`1)Y-#r1ksvMS;M>%+Nr2j}XE*>dPHF5&vg(}wVXM?3gv z2Osa?Q((R~*Z?5(hhH9MK`OfQg<*WuMql1@QNegDYL6tgLpiVmiR`Ph&Z_N!0<=z@ zS_S{ifKP1yNQR0&6Pe2I%qNh|B$kHB#@Wa=nH(^TQJ2UI>aq+UuGuA36{-qVg{r<9 zHL40#LSRPVpW6UYtWX8lXQEYQRae-lf^UpQ>Q&Lvsp1N%-{lA9X-80kga;?a@58}i q5q51NZ*3UXVOWP@-9Qr8laW(7agDfRfDwp8*O!4yq~}H`zLdWUBe>fD diff --git a/common/buildcraft/core/robots/RobotAIDirectMoveTo.java b/common/buildcraft/core/robots/RobotAIDirectMoveTo.java index f0ba3a99..966b9b0e 100755 --- a/common/buildcraft/core/robots/RobotAIDirectMoveTo.java +++ b/common/buildcraft/core/robots/RobotAIDirectMoveTo.java @@ -14,7 +14,7 @@ public class RobotAIDirectMoveTo extends RobotAIBase { private double prevDistance = Double.MAX_VALUE; private boolean done = false; - float x, y, z; + private float x, y, z; public RobotAIDirectMoveTo(EntityRobot iRobot, float ix, float iy, float iz) { super(iRobot); diff --git a/tests/buildcraft/tests/GuiTester.java b/tests/buildcraft/tests/GuiTester.java index 9589f9a3..6f9e8016 100755 --- a/tests/buildcraft/tests/GuiTester.java +++ b/tests/buildcraft/tests/GuiTester.java @@ -40,8 +40,8 @@ public class GuiTester extends GuiContainer { private GuiTextField textField; - World world; - int x, y, z; + private World world; + private int x, y, z; public GuiTester(EntityPlayer player, int ix, int iy, int iz) { super(new ContainerTester(player, ix, iy, iz)); @@ -57,24 +57,24 @@ public class GuiTester extends GuiContainer { @Override public void initGui() { super.initGui(); - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; + int xscreen = (width - xSize) / 2; + int yscreen = (height - ySize) / 2; Keyboard.enableRepeatEvents(true); - checkBlockAndMeta = new GuiButton(0, x + 5, y + 30, 120, 20, ""); + checkBlockAndMeta = new GuiButton(0, xscreen + 5, yscreen + 30, 120, 20, ""); checkBlockAndMeta.displayString = "Check Block and Meta"; buttonList.add(checkBlockAndMeta); - checkTileMethod = new GuiButton(1, x + 5, y + 55, 120, 20, ""); + checkTileMethod = new GuiButton(1, xscreen + 5, yscreen + 55, 120, 20, ""); checkTileMethod.displayString = "Check Tile Method"; buttonList.add(checkTileMethod); - checkTestCommand = new GuiButton(2, x + 5, y + 80, 120, 20, ""); + checkTestCommand = new GuiButton(2, xscreen + 5, yscreen + 80, 120, 20, ""); checkTestCommand.displayString = "Check Test Command"; buttonList.add(checkTestCommand); - cancel = new GuiButton(2, x + 5, y + 105, 120, 20, ""); + cancel = new GuiButton(2, xscreen + 5, yscreen + 105, 120, 20, ""); cancel.displayString = "Cancel"; buttonList.add(cancel); @@ -119,11 +119,11 @@ public class GuiTester extends GuiContainer { int xMin = (width - xSize) / 2; int yMin = (height - ySize) / 2; - int x = i - xMin; - int y = j - yMin; + int xscreen = i - xMin; + int yscreen = j - yMin; - if (x >= TEXT_X && y >= TEXT_Y - && x <= TEXT_X + TEXT_WIDTH && y <= TEXT_Y + TEXT_HEIGHT) { + if (xscreen >= TEXT_X && yscreen >= TEXT_Y + && xscreen <= TEXT_X + TEXT_WIDTH && yscreen <= TEXT_Y + TEXT_HEIGHT) { textField.setFocused(true); } else { textField.setFocused(false);