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

Unified stat system

Browse Source
This commit is contained in:
Anuken
2020-10-19 11:12:40 -04:00
parent 59e1fd1eb6
commit 2ff749bd17
101 changed files with 1815 additions and 1815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/consumers/Consume.java
View File

@@ -69,5 +69,5 @@ public abstract class Consume{
public abstract boolean valid(Building entity);
public abstract void display(BlockStats stats);
public abstract void display(Stats stats);
}

2
core/src/mindustry/world/consumers/ConsumeItemDynamic.java
View File

@@ -73,7 +73,7 @@ public class ConsumeItemDynamic extends Consume{
}
@Override
public void display(BlockStats stats){
public void display(Stats stats){
//should be handled by the block
}
}

4
core/src/mindustry/world/consumers/ConsumeItemFilter.java
View File

@@ -70,7 +70,7 @@ public class ConsumeItemFilter extends Consume{
}
@Override
public void display(BlockStats stats){
stats.add(booster ? BlockStat.booster : BlockStat.input, new ItemFilterValue(filter));
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, new ItemFilterValue(filter));
}
}

4
core/src/mindustry/world/consumers/ConsumeItems.java
View File

@@ -63,7 +63,7 @@ public class ConsumeItems extends Consume{
}
@Override
public void display(BlockStats stats){
stats.add(booster ? BlockStat.booster : BlockStat.input, new ItemListValue(items));
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, new ItemListValue(items));
}
}

4
core/src/mindustry/world/consumers/ConsumeLiquid.java
View File

@@ -45,7 +45,7 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
}
@Override
public void display(BlockStats stats){
stats.add(booster ? BlockStat.booster : BlockStat.input, liquid, amount * timePeriod, timePeriod == 60);
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, liquid, amount * timePeriod, timePeriod == 60);
}
}

4
core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
View File

@@ -49,7 +49,7 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
}
@Override
public void display(BlockStats stats){
stats.add(booster ? BlockStat.booster : BlockStat.input, new LiquidFilterValue(filter, amount * timePeriod, timePeriod == 60f));
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, new LiquidFilterValue(filter, amount * timePeriod, timePeriod == 60f));
}
}

6
core/src/mindustry/world/consumers/ConsumePower.java
View File

@@ -54,11 +54,11 @@ public class ConsumePower extends Consume{
}
@Override
public void display(BlockStats stats){
public void display(Stats stats){
if(buffered){
stats.add(BlockStat.powerCapacity, capacity, StatUnit.none);
stats.add(Stat.powerCapacity, capacity, StatUnit.none);
}else{
stats.add(BlockStat.powerUse, usage * 60f, StatUnit.powerSecond);
stats.add(Stat.powerUse, usage * 60f, StatUnit.powerSecond);
}
}

2
core/src/mindustry/world/consumers/Consumers.java
View File

@@ -109,7 +109,7 @@ public class Consumers{
return optionalResults;
}
public void display(BlockStats stats){
public void display(Stats stats){
for(Consume c : map){
if(c != null){
c.display(stats);