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

Implemented desktop-specific recipes, removed Configurable

Browse Source
This commit is contained in:
Anuken
2018-01-09 17:47:34 -05:00
parent 8e676494e3
commit 9c48ab1128
21 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/input/AndroidInput.java
View File

@@ -9,7 +9,6 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.Configurable;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Timers;
@@ -75,7 +74,7 @@ public class AndroidInput extends InputHandler{
Tile cursor = world.tile(Mathf.scl2(Graphics.mouseWorld().x, tilesize), Mathf.scl2(Graphics.mouseWorld().y, tilesize));
if(cursor != null && !ui.hasMouse(screenX, screenY)){
Tile linked = cursor.isLinked() ? cursor.getLinked() : cursor;
if(linked != null && linked.block() instanceof Configurable){
if(linked != null && linked.block().isConfigurable(linked)){
ui.configfrag.showConfig(linked);
}else if(!ui.configfrag.hasConfigMouse()){
ui.configfrag.hideConfig();

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

@@ -8,7 +8,6 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.Configurable;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Timers;
@@ -92,7 +91,7 @@ public class DesktopInput extends InputHandler{
if(Inputs.keyTap("select") && cursor != null && !ui.hasMouse()){
Tile linked = cursor.isLinked() ? cursor.getLinked() : cursor;
if(linked != null && linked.block() instanceof Configurable){
if(linked != null && linked.block().isConfigurable(linked)){
ui.configfrag.showConfig(linked);
}else if(!ui.configfrag.hasConfigMouse()){
ui.configfrag.hideConfig();

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

@@ -17,7 +17,6 @@ import io.anuke.mindustry.world.SpawnPoint;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.ProductionBlocks;
import io.anuke.mindustry.world.blocks.types.Configurable;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Sounds;
@@ -51,7 +50,7 @@ public abstract class InputHandler extends InputAdapter{
public boolean onConfigurable(){
Tile tile = Vars.world.tile(getBlockX(), getBlockY());
return tile != null && (tile.block() instanceof Configurable || (tile.isLinked() && tile.getLinked().block() instanceof Configurable));
return tile != null && (tile.block().isConfigurable(tile) || (tile.isLinked() && tile.getLinked().block().isConfigurable(tile)));
}
public boolean cursorNear(){