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

Read-only component fields / Removed get/set prefix

Browse Source
This commit is contained in:
Anuken
2020-02-04 12:14:09 -05:00
parent 1d0cfd4435
commit 36b9451e01
93 changed files with 637 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/input/DesktopInput.java
View File

@@ -136,7 +136,7 @@ public class DesktopInput extends InputHandler{
ui.listfrag.toggle();
}
if(((player.getClosestCore() == null && player.isDead()) || state.isPaused()) && !ui.chatfrag.shown()){
if(((player.closestCore() == null && player.dead()) || state.isPaused()) && !ui.chatfrag.shown()){
//move camera around
float camSpeed = !Core.input.keyDown(Binding.dash) ? 3f : 8f;
Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed));
@@ -162,7 +162,7 @@ public class DesktopInput extends InputHandler{
renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
}
if(player.isDead()){
if(player.dead()){
cursorType = SystemCursor.arrow;
return;
}
@@ -222,7 +222,7 @@ public class DesktopInput extends InputHandler{
cursorType = ui.unloadCursor;
}
if(cursor.interactable(player.getTeam()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate){
if(cursor.interactable(player.team()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate){
Call.rotateBlock(player, cursor, Core.input.axisTap(Binding.rotate) > 0);
}
}

22
core/src/mindustry/input/InputHandler.java
View File

@@ -132,7 +132,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ItemTransfer.create(item,
player.x + Angles.trnsx(player.rotation + 180f, backTrns), player.y + Angles.trnsy(player.rotation + 180f, backTrns),
new Vec2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
if(tile.block() != block || tile.entity == null || tile.entity.getItems() == null) return;
if(tile.block() != block || tile.entity == null || tile.entity.items() == null) return;
tile.block().handleStack(item, removed, tile, player);
remaining[1] -= removed;
@@ -417,7 +417,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
}
for(BrokenBlock req : player.getTeam().data().brokenBlocks){
for(BrokenBlock req : player.team().data().brokenBlocks){
Block block = content.block(req.block);
if(block.bounds(req.x, req.y, Tmp.r2).overlaps(Tmp.r1)){
drawSelected(req.x, req.y, content.block(req.block), Pal.remove);
@@ -525,7 +525,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
//remove blocks to rebuild
Iterator<BrokenBlock> broken = state.teams.get(player.getTeam()).brokenBlocks.iterator();
Iterator<BrokenBlock> broken = state.teams.get(player.team()).brokenBlocks.iterator();
while(broken.hasNext()){
BrokenBlock req = broken.next();
Block block = content.block(req.block);
@@ -565,7 +565,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
boolean consumed = false, showedInventory = false;
//check if tapped block is configurable
if(tile.block().configurable && tile.interactable(player.getTeam())){
if(tile.block().configurable && tile.interactable(player.team())){
consumed = true;
if(((!frag.config.isShown() && tile.block().shouldShowConfigure(tile, player)) //if the config fragment is hidden, show
//alternatively, the current selected block can 'agree' to switch config tiles
@@ -587,15 +587,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
//call tapped event
if(!consumed && tile.interactable(player.getTeam())){
if(!consumed && tile.interactable(player.team())){
Call.onTileTapped(player, tile);
}
//consume tap event if necessary
if(tile.interactable(player.getTeam()) && tile.block().consumesTap){
if(tile.interactable(player.team()) && tile.block().consumesTap){
consumed = true;
}else if(tile.interactable(player.getTeam()) && tile.block().synthetic() && !consumed){
if(tile.block().hasItems && tile.entity.getItems().total() > 0){
}else if(tile.interactable(player.team()) && tile.block().synthetic() && !consumed){
if(tile.block().hasItems && tile.entity.items().total() > 0){
frag.inv.showFor(tile);
consumed = true;
showedInventory = true;
@@ -750,7 +750,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ItemStack stack = player.item();
if(tile.block().acceptStack(stack.item, stack.amount, tile, player) > 0 && tile.interactable(player.getTeam()) && tile.block().hasItems && player.item().amount > 0 && !player.isTransferring && tile.interactable(player.getTeam())){
if(tile.block().acceptStack(stack.item, stack.amount, tile, player) > 0 && tile.interactable(player.team()) && tile.block().hasItems && player.item().amount > 0 && !player.isTransferring && tile.interactable(player.team())){
Call.transferInventory(player, tile);
}else{
Call.dropItem(player.angleTo(x, y));
@@ -782,11 +782,11 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
return false;
}
}
return Build.validPlace(player.getTeam(), x, y, type, rotation);
return Build.validPlace(player.team(), x, y, type, rotation);
}
public boolean validBreak(int x, int y){
return Build.validBreak(player.getTeam(), x, y);
return Build.validBreak(player.team(), x, y);
}
public void placeBlock(int x, int y, Block block, int rotation){

12
core/src/mindustry/input/MobileInput.java
View File

@@ -67,7 +67,7 @@ public class MobileInput extends InputHandler implements GestureListener{
/** Check and assign targets for a specific position. */
void checkTargets(float x, float y){
Unitc unit = Units.closestEnemy(player.getTeam(), x, y, 20f, u -> !u.isDead());
Unitc unit = Units.closestEnemy(player.team(), x, y, 20f, u -> !u.dead());
if(unit != null){
player.setMineTile(null);
@@ -75,11 +75,11 @@ public class MobileInput extends InputHandler implements GestureListener{
}else{
Tile tile = world.ltileWorld(x, y);
if(tile != null && tile.synthetic() && player.getTeam().isEnemy(tile.getTeam())){
if(tile != null && tile.synthetic() && player.team().isEnemy(tile.getTeam())){
Tilec entity = tile.entity;
player.setMineTile(null);
player.target = entity;
}else if(tile != null && player.mech.canHeal && tile.entity != null && tile.getTeam() == player.getTeam() && tile.entity.damaged()){
}else if(tile != null && player.mech.canHeal && tile.entity != null && tile.getTeam() == player.team() && tile.entity.damaged()){
player.setMineTile(null);
player.target = tile.entity;
}
@@ -441,7 +441,7 @@ public class MobileInput extends InputHandler implements GestureListener{
down = true;
if(player.isDead()) return false;
if(player.dead()) return false;
//get tile on cursor
Tile cursor = tileAt(screenX, screenY);
@@ -518,7 +518,7 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override
public boolean longPress(float x, float y){
if(state.is(State.menu) || mode == none || player.isDead()) return false;
if(state.is(State.menu) || mode == none || player.dead()) return false;
//get tile on cursor
Tile cursor = tileAt(x, y);
@@ -583,7 +583,7 @@ public class MobileInput extends InputHandler implements GestureListener{
mode = none;
}
if(player.isDead()){
if(player.dead()){
mode = none;
}