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

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

Browse Source
This commit is contained in:
Anuken
2019-01-06 10:21:15 -05:00
parent 5661124d86 397da91ab4
commit 415252a5b2
7 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/Recipes.java
View File

@@ -82,7 +82,7 @@ public class Recipes implements ContentList{
new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.copper, 2)).setAlwaysUnlocked(true);
new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.copper, 6)).setAlwaysUnlocked(true);
//advanced densealloy transporat
//advanced densealloy transport
new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8));
new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 4));
new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 8));

4
core/src/io/anuke/mindustry/entities/TileEntity.java
View File

@@ -71,7 +71,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
}
/**Sets this tile entity data to this tile, and adds it if necessary.*/
public TileEntity init(Tile tile, boolean added){
public TileEntity init(Tile tile, boolean shouldAdd){
this.tile = tile;
x = tile.drawx();
y = tile.drawy();
@@ -80,7 +80,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
timer = new Interval(tile.block().timers);
if(added){
if(shouldAdd){
add();
}