Moved many block files; work on annotation processor

This commit is contained in:
Anuken
2018-06-06 14:51:25 -04:00
parent 917e2e40fb
commit ccb97e34d5
147 changed files with 685 additions and 520 deletions

View File

@@ -0,0 +1,23 @@
package io.anuke.mindustry.input;
import io.anuke.ucore.function.Callable;
import io.anuke.ucore.scene.utils.Cursors;
/**Type of cursor for displaying on desktop.*/
public enum CursorType {
normal(Cursors::restoreCursor),
hand(Cursors::setHand),
drill(() -> Cursors.set("drill")),
unload(() -> Cursors.set("unload"));
private final Callable call;
CursorType(Callable call){
this.call = call;
}
/**Sets the current system cursor to this.*/
void set(){
call.run();
}
}

View File

@@ -16,15 +16,13 @@ import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Inputs.DeviceType;
import io.anuke.ucore.core.KeyBinds;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.function.Callable;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.scene.ui.layout.Unit;
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.*;
import static io.anuke.mindustry.input.CursorType.*;
import static io.anuke.mindustry.input.PlaceMode.*;
public class DesktopInput extends InputHandler{
@@ -154,9 +152,7 @@ public class DesktopInput extends InputHandler{
if(cursor != null){
cursor = cursor.target();
if(cursor.block().isCursor(cursor)) {
cursorType = hand;
}
cursorType = cursor.block().getCursor(cursor);
if(canMine(cursor)){
cursorType = drill;
@@ -314,20 +310,4 @@ public class DesktopInput extends InputHandler{
}
}
enum CursorType{
normal(Cursors::restoreCursor),
hand(Cursors::setHand),
drill(() -> Cursors.set("drill")),
unload(() -> Cursors.set("unload"));
private final Callable call;
CursorType(Callable call){
this.call = call;
}
void set(){
call.run();
}
}
}

View File

@@ -94,7 +94,7 @@ public abstract class InputHandler extends InputAdapter{
boolean showedInventory = false;
//check if tapped block is configurable
if(tile.block().isConfigurable(tile) && tile.getTeam() == player.getTeam()){
if(tile.block().configurable && tile.getTeam() == player.getTeam()){
consumed = true;
if((!frag.config.isShown() //if the config fragment is hidden, show
//alternatively, the current selected block can 'agree' to switch config tiles