Read-only component fields / Removed get/set prefix

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

View File

@ -8,7 +8,6 @@ import mindustry.content.*;
import mindustry.core.*;
import mindustry.core.GameState.*;
import mindustry.ctype.*;
import mindustry.entities.type.*;
import mindustry.entities.type.base.*;
import mindustry.entities.units.*;
import mindustry.game.*;
@ -143,12 +142,12 @@ public class ApplicationTests{
void blockInventories(){
multiblock();
Tile tile = world.tile(4, 4);
tile.entity.getItems().add(Items.coal, 5);
tile.entity.getItems().add(Items.titanium, 50);
assertEquals(tile.entity.getItems().total(), 55);
tile.entity.getItems().remove(Items.phasefabric, 10);
tile.entity.getItems().remove(Items.titanium, 10);
assertEquals(tile.entity.getItems().total(), 45);
tile.entity.items().add(Items.coal, 5);
tile.entity.items().add(Items.titanium, 50);
assertEquals(tile.entity.items().total(), 55);
tile.entity.items().remove(Items.phasefabric, 10);
tile.entity.items().remove(Items.titanium, 10);
assertEquals(tile.entity.items().total(), 45);
}
@Test
@ -422,7 +421,7 @@ public class ApplicationTests{
Tile core = world.tile(5, 5);
core.set(Blocks.coreShard, Team.sharded);
for(Item item : content.items()){
core.entity.getItems().set(item, 3000);
core.entity.items().set(item, 3000);
}
assertEquals(core.entity, state.teams.get(Team.sharded).core());
@ -439,12 +438,12 @@ public class ApplicationTests{
assertEquals(capacity - 1, deposited);
tile.block().handleStack(item, capacity - 1, tile, unit);
assertEquals(tile.entity.getItems().get(item), capacity - 1);
assertEquals(tile.entity.items().get(item), capacity - 1);
int overflow = tile.block().acceptStack(item, 10, tile, unit);
assertEquals(1, overflow);
tile.block().handleStack(item, 1, tile, unit);
assertEquals(capacity, tile.entity.getItems().get(item));
assertEquals(capacity, tile.entity.items().get(item));
}
}