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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source
This commit is contained in:
Anuken
2018-03-23 22:48:51 -04:00
parent 7b3d60215b 2dd67c229c
commit 4e9d1d348e
24 changed files with 1535 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ public class DefaultKeybinds {
"block_info", Input.CONTROL_LEFT,
"player_list", Input.TAB,
"chat", Input.ENTER,
"chat_scroll_up", Input.UP,
"chat_scroll_down", Input.DOWN,
"console", Input.GRAVE,
"weapon_1", Input.NUM_1,
"weapon_2", Input.NUM_2,
@@ -53,6 +55,8 @@ public class DefaultKeybinds {
"rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B),
"player_list", Input.CONTROLLER_START,
"chat", Input.ENTER,
"chat_scroll_up", Input.UP,
"chat_scroll_down", Input.DOWN,
"console", Input.GRAVE,
"weapon_1", Input.NUM_1,
"weapon_2", Input.NUM_2,

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

@@ -107,6 +107,10 @@ public class DesktopInput extends InputHandler{
Cursors.restoreCursor();
}
}
if(target != null && target.block().isConfigurable(target)){
showCursor = true;
}
if(target != null && Inputs.keyTap("select") && !ui.hasMouse()){
if(target.block().isConfigurable(target)){

12
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -116,19 +116,23 @@ public abstract class InputHandler extends InputAdapter{
}
public void placeBlock(int x, int y, Block result, int rotation, boolean effects, boolean sound){
if(!Net.client()){
if(!Net.client()){ //is server or singleplayer
Placement.placeBlock(player.team, x, y, result, rotation, effects, sound);
Tile tile = world.tile(x, y);
if(tile != null) result.placed(tile);
}
if(Net.active()){
NetEvents.handlePlace(x, y, result, rotation);
}
if(!Net.client()){
Tile tile = world.tile(x, y);
if(tile != null) result.placed(tile);
}
}
public void breakBlock(int x, int y, boolean sound){
if(!Net.client()) Placement.breakBlock(player.team, x, y, true, sound);
if(!Net.client())
Placement.breakBlock(player.team, x, y, true, sound);
if(Net.active()){
NetEvents.handleBreak(x, y);