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

Many changes to improve scripting

Browse Source
This commit is contained in:
Anuken
2019-12-08 18:34:23 -05:00
parent a7d37b7e6c
commit 1aca302518
81 changed files with 288 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/test/java/power/DirectConsumerTests.java
View File

@@ -41,7 +41,7 @@ public class DirectConsumerTests extends PowerTestFixture{
consumerTile.entity.items.add(Items.lead, leadAmount);
Tile producerTile = createFakeTile(2, 0, createFakeProducerBlock(producedPower));
producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1f;
producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
PowerGraph graph = new PowerGraph();
graph.add(producerTile);

2
tests/src/test/java/power/ItemLiquidGeneratorTests.java
View File

@@ -52,7 +52,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
};
tile = createFakeTile(0, 0, generator);
entity = tile.entity();
entity = tile.ent();
}
/** Tests the consumption and efficiency when being supplied with liquids. */

8
tests/src/test/java/power/PowerTests.java
View File

@@ -51,7 +51,7 @@ public class PowerTests extends PowerTestFixture{
void simulateDirectConsumption(float producedPower, float requiredPower, float expectedSatisfaction, String parameterDescription){
Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1f;
producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
Tile directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requiredPower));
PowerGraph powerGraph = new PowerGraph();
@@ -91,7 +91,7 @@ public class PowerTests extends PowerTestFixture{
if(producedPower > 0.0f){
Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1f;
producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
powerGraph.add(producerTile);
}
Tile directConsumerTile = null;
@@ -116,7 +116,7 @@ public class PowerTests extends PowerTestFixture{
@Test
void directConsumptionStopsWithNoPower(){
Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(10.0f));
producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1.0f;
producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1.0f;
Tile consumerTile = createFakeTile(0, 1, createFakeDirectConsumer(5.0f));
PowerGraph powerGraph = new PowerGraph();
@@ -133,7 +133,7 @@ public class PowerTests extends PowerTestFixture{
assertEquals(0.0f, consumerTile.entity.power.status, Mathf.FLOAT_ROUNDING_ERROR);
if(consumerTile.block().consumes.hasPower()){
ConsumePower consumePower = consumerTile.block().consumes.getPower();
assertFalse(consumePower.valid(consumerTile.entity()));
assertFalse(consumePower.valid(consumerTile.ent()));
}
}
}