mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-24 05:21:15 -08:00
Code Issues Projects Releases Wiki Activity

non-functional loading screen

Browse source
This commit is contained in:
Anuken 2019-08-26 22:53:11 -04:00
parent 1fc9c82aaf
commit 76cd7ba8d1
211 changed files with 722 additions and 699 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/src/test/java/ApplicationTests.java
View file

@ -4,16 +4,14 @@ import io.anuke.arc.backends.headless.HeadlessApplication;
import io.anuke.arc.math.geom.Point2;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.entities.type.base.*;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.io.BundleLoader;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.type.ContentType;
@ -22,7 +20,7 @@ import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.BlockPart;
import org.junit.jupiter.api.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
import static org.junit.jupiter.api.Assertions.*;
public class ApplicationTests{
@ -43,25 +41,23 @@ public class ApplicationTests{
ApplicationCore core = new ApplicationCore(){
@Override
public void setup(){
Vars.init();
Min.init();
headless = true;
BundleLoader.load();
content.load();
load();
content.createContent();
add(logic = new Logic());
add(world = new World());
add(netServer = new NetServer());
content.initialize(Content::init);
}
@Override
public void init(){
super.init();
begins[0] = true;
testMap = world.maps.loadInternalMap("groundZero");
testMap = maps.loadInternalMap("groundZero");
}
};
@ -100,7 +96,7 @@ public class ApplicationTests{
@Test
void spawnWaves(){
world.loadMap(testMap);
assertTrue(world.spawner.countSpawns() > 0, "No spawns present.");
assertTrue(spawner.countSpawns() > 0, "No spawns present.");
logic.runWave();
//force trigger delayed spawns
Time.setDeltaProvider(() -> 1000f);

4
tests/src/test/java/ZoneTests.java
View file

@ -10,7 +10,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
import org.junit.jupiter.api.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
@ -65,7 +65,7 @@ public class ZoneTests{
}
assertTrue(hasSpawnPoint, "Zone \"" + zone.name + "\" has no spawn points.");
assertTrue(world.spawner.countSpawns() > 0 || (state.rules.attackMode && !state.teams.get(waveTeam).cores.isEmpty()), "Zone \"" + zone.name + "\" has no enemy spawn points: " + world.spawner.countSpawns());
assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && !state.teams.get(waveTeam).cores.isEmpty()), "Zone \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns());
for(Item item : resources){
assertTrue(Structs.contains(zone.resources, item), "Zone \"" + zone.name + "\" is missing item in resource list: \"" + item.name + "\"");

6
tests/src/test/java/power/PowerTestFixture.java
View file

@ -4,7 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.core.ContentLoader;
import io.anuke.mindustry.world.Block;
@ -31,8 +31,8 @@ public class PowerTestFixture{
@BeforeAll
static void initializeDependencies(){
Core.graphics = new FakeGraphics();
Vars.content = new ContentLoader();
Vars.content.load();
Min.content = new ContentLoader();
Min.content.createContent();
Log.setUseColors(false);
Time.setDeltaProvider(() -> 0.5f);
}