mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 22:42:41 -08:00
Code Issues Projects Releases Wiki Activity

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties
This commit is contained in:
Anuken 2019-12-01 17:42:56 -05:00
commit 78f146fbcf
178 changed files with 4412 additions and 1699 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,7 @@ public class ApplicationTests{
super.init();
begins[0] = true;
testMap = maps.loadInternalMap("groundZero");
Thread.currentThread().interrupt();
}
};
@ -212,15 +213,24 @@ public class ApplicationTests{
}
@Test
void loadOldSave(){
void load77Save(){
resetWorld();
SaveIO.load(Core.files.internal("build77.msav"));
SaveIO.load(Core.files.internal("77.msav"));
//just tests if the map was loaded properly and didn't crash, no validity checks currently
assertEquals(276, world.width());
assertEquals(10, world.height());
}
@Test
void load85Save(){
resetWorld();
SaveIO.load(Core.files.internal("85.msav"));
assertEquals(250, world.width());
assertEquals(300, world.height());
}
@Test
void arrayIterators(){
Array<String> arr = Array.with("a", "b" , "c", "d", "e", "f");

22
tests/src/test/java/power/ItemLiquidGeneratorTests.java
View file

@ -1,18 +1,18 @@
package power;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Liquid;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator;
import io.anuke.arc.util.*;
import io.anuke.mindustry.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.power.*;
import org.junit.jupiter.api.*;
import java.util.ArrayList;
import java.util.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
/**
@ -31,6 +31,8 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
private final float maximumLiquidUsage = 0.5f;
public void createGenerator(InputType inputType){
Vars.state = new GameState();
Vars.state.rules = new Rules();
generator = new ItemLiquidGenerator(inputType != InputType.liquids, inputType != InputType.items, "fakegen"){
{
powerProduction = 0.1f;