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

Make an interface for blocks that spawn tethered units (#8395)

Browse Source
This commit is contained in:
MEEPofFaith
2023-03-25 10:51:43 -07:00
committed by GitHub
parent 4be7cf5c0e
commit 90f7bbae65
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/world/blocks/UnitTetherBlock.java Normal file
View File

@@ -0,0 +1,5 @@
package mindustry.world.blocks;
public interface UnitTetherBlock{
void spawned(int id);
}

9
core/src/mindustry/world/blocks/units/UnitCargoLoader.java
View File

@@ -16,6 +16,7 @@ import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -75,12 +76,12 @@ public class UnitCargoLoader extends Block{
} }
@Remote(called = Loc.server) @Remote(called = Loc.server)
public static void cargoLoaderDroneSpawned(Tile tile, int id){ public static void unitTetherBlockSpawned(Tile tile, int id){
if(tile == null || !(tile.build instanceof UnitTransportSourceBuild build)) return; if(tile == null || !(tile.build instanceof UnitTetherBlock build)) return;
build.spawned(id); build.spawned(id);
} }
public class UnitTransportSourceBuild extends Building{ public class UnitTransportSourceBuild extends Building implements UnitTetherBlock{
//needs to be "unboxed" after reading, since units are read after buildings. //needs to be "unboxed" after reading, since units are read after buildings.
public int readUnitId = -1; public int readUnitId = -1;
public float buildProgress, totalProgress; public float buildProgress, totalProgress;
@@ -117,7 +118,7 @@ public class UnitCargoLoader extends Block{
unit.set(x, y); unit.set(x, y);
unit.rotation = 90f; unit.rotation = 90f;
unit.add(); unit.add();
Call.cargoLoaderDroneSpawned(tile, unit.id); Call.unitTetherBlockSpawned(tile, unit.id);
} }
} }
} }