Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mess cleanup

Browse Source
This commit is contained in:
Anuken
2018-06-02 00:47:22 -04:00
parent ba805739b0
commit 3fe7e4e8da
11 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
View File

@@ -41,7 +41,7 @@ public class DefaultKeybinds {
"chat_history_next", Input.DOWN,
"chat_scroll", new Axis(Input.SCROLL),
"console", Input.GRAVE,
"block_logs", Input.I,
"block_logs", Input.I
);
KeyBinds.defaultSection(section, DeviceType.controller,

11
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -9,6 +9,7 @@ import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.input.PlaceUtils.NormalizeDrawResult;
import io.anuke.mindustry.input.PlaceUtils.NormalizeResult;
import io.anuke.mindustry.net.NetEvents;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Inputs;
@@ -23,9 +24,7 @@ import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.input.DesktopInput.CursorType.drill;
import static io.anuke.mindustry.input.DesktopInput.CursorType.hand;
import static io.anuke.mindustry.input.DesktopInput.CursorType.normal;
import static io.anuke.mindustry.input.DesktopInput.CursorType.*;
import static io.anuke.mindustry.input.PlaceMode.*;
public class DesktopInput extends InputHandler{
@@ -166,13 +165,11 @@ public class DesktopInput extends InputHandler{
cursorType = drill;
}
if(recipe == null && !ui.hasMouse() && Inputs.keyDown("block_info")
&& cursor.block().fullDescription != null){
if(recipe == null && !ui.hasMouse() && Inputs.keyDown("block_logs")) {
cursorType = hand;
if(Inputs.keyTap("select")){
ui.hudfrag.blockfrag.showBlockInfo(cursor.block());
NetEvents.handleBlockLogRequest(cursor.x, cursor.y);
Cursors.restoreCursor();
cursorType = normal;
}
}
}