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

Merged changes

Browse Source
This commit is contained in:
Anuken
2020-11-03 17:20:43 -05:00
parent df81ac2129
commit 696ad92b59
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/content/Blocks.java
View File

@@ -532,7 +532,7 @@ public class Blocks implements ContentList{
hasLiquids = false;
flameColor = Color.valueOf("ffef99");
consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2));
consumes.items(with(Items.coal, 1, Items.sand, 2));
consumes.power(0.50f);
}};
@@ -548,7 +548,7 @@ public class Blocks implements ContentList{
itemCapacity = 30;
boostScale = 0.15f;
consumes.items(new ItemStack(Items.coal, 4), new ItemStack(Items.sand, 6), new ItemStack(Items.pyratite, 1));
consumes.items(with(Items.coal, 4, Items.sand, 6, Items.pyratite, 1));
consumes.power(4f);
}};
@@ -561,7 +561,7 @@ public class Blocks implements ContentList{
hasPower = hasItems = true;
flameColor = Color.valueOf("ffc099");
consumes.items(new ItemStack(Items.lead, 1), new ItemStack(Items.sand, 1));
consumes.items(with(Items.lead, 1, Items.sand, 1));
consumes.power(0.60f);
}};
@@ -592,7 +592,7 @@ public class Blocks implements ContentList{
hasPower = true;
drawer = new DrawWeave();
consumes.items(new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10));
consumes.items(with(Items.thorium, 4, Items.sand, 10));
consumes.power(5f);
itemCapacity = 20;
}};
@@ -606,7 +606,7 @@ public class Blocks implements ContentList{
hasPower = true;
consumes.power(4f);
consumes.items(new ItemStack(Items.copper, 3), new ItemStack(Items.lead, 4), new ItemStack(Items.titanium, 2), new ItemStack(Items.silicon, 3));
consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3));
}};
cryofluidMixer = new LiquidConverter("cryofluid-mixer"){{
@@ -637,7 +637,7 @@ public class Blocks implements ContentList{
size = 2;
consumes.power(0.20f);
consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.lead, 2), new ItemStack(Items.sand, 2));
consumes.items(with(Items.coal, 1, Items.lead, 2, Items.sand, 2));
}};
blastMixer = new GenericCrafter("blast-mixer"){{
@@ -647,7 +647,7 @@ public class Blocks implements ContentList{
outputItem = new ItemStack(Items.blastCompound, 1);
size = 2;
consumes.items(new ItemStack(Items.pyratite, 1), new ItemStack(Items.sporePod, 1));
consumes.items(with(Items.pyratite, 1, Items.sporePod, 1));
consumes.power(0.40f);
}};