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

Remove explosive danger notice

Browse Source 
Surprise!!!!
This commit is contained in:
MEEPofFaith
2024-03-16 14:28:44 -07:00
parent 3021ac5d60
commit e1476abbfd
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/world/blocks/power/ConsumeGenerator.java
View File

@@ -73,14 +73,6 @@ public class ConsumeGenerator extends PowerGenerator{
if(outputLiquid != null){ if(outputLiquid != null){
stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * 60f, true)); stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * 60f, true));
} }
if(filterItem != null){
ConsumeItemExplode explode = findConsumer(c -> c instanceof ConsumeItemExplode);
if(explode != null){
stats.remove(Stat.input);
stats.add(Stat.input, StatValues.itemEffMultiplier(i -> filterItem.itemEfficiencyMultiplier(i), filterItem.filter, explode.filter));
}
}
} }
public class ConsumeGeneratorBuild extends GeneratorBuild{ public class ConsumeGeneratorBuild extends GeneratorBuild{

10
core/src/mindustry/world/meta/StatValues.java
View File

@@ -292,7 +292,7 @@ public class StatValues{
}; };
} }
public static StatValue itemEffMultiplier(Floatf<Item> efficiency, Boolf<Item> filter, Boolf<Item> explosive){ public static StatValue itemEffMultiplier(Floatf<Item> efficiency, Boolf<Item> filter){
return table -> { return table -> {
table.row(); table.row();
table.table(c -> { table.table(c -> {
@@ -302,10 +302,6 @@ public class StatValues{
b.add(item.localizedName).left().grow(); b.add(item.localizedName).left().grow();
b.table(e -> { b.table(e -> {
e.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().labelAlign(Align.right); e.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().labelAlign(Align.right);
if(explosive.get(item)){
e.row();
e.add(Core.bundle.get("stat.explosive")).right().labelAlign(Align.right);
}
}).right().pad(10f).padRight(15f); }).right().pad(10f).padRight(15f);
}).growX().pad(5).row(); }).growX().pad(5).row();
@@ -315,10 +311,6 @@ public class StatValues{
}; };
} }
public static StatValue itemEffMultiplier(Floatf<Item> efficiency, Boolf<Item> filter){
return itemEffMultiplier(efficiency, filter, i -> false);
}
public static StatValue liquidEffMultiplier(Floatf<Liquid> efficiency, Boolf<Liquid> filter){ public static StatValue liquidEffMultiplier(Floatf<Liquid> efficiency, Boolf<Liquid> filter){
return table -> { return table -> {
table.row(); table.row();