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

Moved Nullable to utils package

Browse Source
This commit is contained in:
Anuken
2020-10-02 23:11:26 -04:00
parent ae2a4ea2d6
commit 35af71c613
87 changed files with 66 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/mindustry/world/blocks/Autotiler.java
View File

@@ -3,7 +3,6 @@ package mindustry.world.blocks;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
@@ -149,20 +148,19 @@ public interface Autotiler{
* @param bits The blending value array
*/
default void transformCase(int num, int[] bits){
if(num == 0){
bits[0] = 3;
}else if(num == 1){
bits[0] = 4;
}else if(num == 2){
bits[0] = 2;
}else if(num == 3){
bits[0] = 2;
bits[2] = -1;
}else if(num == 4){
bits[0] = 1;
bits[2] = -1;
}else if(num == 5){
bits[0] = 1;
switch(num){
case 0 -> bits[0] = 3;
case 1 -> bits[0] = 4;
case 2 -> bits[0] = 2;
case 3 -> {
bits[0] = 2;
bits[2] = -1;
}
case 4 -> {
bits[0] = 1;
bits[2] = -1;
}
case 5 -> bits[0] = 1;
}
}

1
core/src/mindustry/world/blocks/ConstructBlock.java
View File

@@ -6,7 +6,6 @@ import arc.Graphics.Cursor.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;

1
core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
View File

@@ -4,7 +4,6 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;

1
core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
View File

@@ -3,7 +3,6 @@ package mindustry.world.blocks.defense;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;

1
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -8,7 +8,6 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;

1
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -5,7 +5,6 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;

1
core/src/mindustry/world/blocks/distribution/OverflowGate.java
View File

@@ -1,7 +1,6 @@
package mindustry.world.blocks.distribution;
import arc.math.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;

1
core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
View File

@@ -4,7 +4,6 @@ import arc.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;

1
core/src/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -3,7 +3,6 @@ package mindustry.world.blocks.distribution;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.scene.ui.layout.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.entities.units.*;

2
core/src/mindustry/world/blocks/environment/Floor.java
View File

@@ -7,7 +7,7 @@ import arc.graphics.g2d.TextureAtlas.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.graphics.*;

1
core/src/mindustry/world/blocks/experimental/BlockForge.java
View File

@@ -4,7 +4,6 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;

2
core/src/mindustry/world/blocks/payloads/Payload.java
View File

@@ -1,6 +1,6 @@
package mindustry.world.blocks.payloads;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.game.*;
import mindustry.gen.*;

1
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -7,7 +7,6 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.core.*;

2
core/src/mindustry/world/blocks/production/PayloadAcceptor.java
View File

@@ -3,7 +3,7 @@ package mindustry.world.blocks.production;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;

1
core/src/mindustry/world/blocks/production/SolidPump.java
View File

@@ -3,7 +3,6 @@ package mindustry.world.blocks.production;
import arc.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;

1
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -2,7 +2,6 @@ package mindustry.world.blocks.sandbox;
import arc.graphics.g2d.*;
import arc.scene.ui.layout.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.entities.units.*;

2
core/src/mindustry/world/blocks/storage/StorageBlock.java
View File

@@ -1,7 +1,7 @@
package mindustry.world.blocks.storage;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.*;

1
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -7,7 +7,6 @@ import arc.math.*;
import arc.scene.style.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;