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

Component interface cleanup

Browse Source
This commit is contained in:
Anuken
2025-07-07 20:03:22 -04:00
parent 4aa801f504
commit bcc29e20ae
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Fires.java
View File

@@ -59,7 +59,7 @@ public class Fires{
if(tile != null){ if(tile != null){
Fire fire = get(tile); Fire fire = get(tile);
if(fire != null){ if(fire != null){
fire.time(fire.time + intensity * Time.delta); fire.time += intensity * Time.delta;
Fx.steam.at(fire); Fx.steam.at(fire);
if(fire.time >= fire.lifetime){ if(fire.time >= fire.lifetime){
Events.fire(Trigger.fireExtinguish); Events.fire(Trigger.fireExtinguish);

2
core/src/mindustry/entities/Puddles.java
View File

@@ -110,7 +110,7 @@ public class Puddles{
} }
public static void register(Puddle puddle){ public static void register(Puddle puddle){
world.tiles.setPuddle(puddle.tile().array(), puddle); world.tiles.setPuddle(puddle.tile.array(), puddle);
} }
/** Reacts two liquids together at a location. */ /** Reacts two liquids together at a location. */

4
core/src/mindustry/entities/comp/FireComp.java
View File

@@ -18,7 +18,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@EntityDef(value = {Firec.class}, pooled = true) @EntityDef(value = {Firec.class}, pooled = true)
@Component(base = true) @Component(base = true, genInterface = false)
abstract class FireComp implements Timedc, Posc, Syncc, Drawc{ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
public static final int frames = 40, duration = 90; public static final int frames = 40, duration = 90;
@@ -88,7 +88,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
//apply damage to nearby units & building //apply damage to nearby units & building
if((damageTimer += Time.delta) >= damageDelay){ if((damageTimer += Time.delta) >= damageDelay){
damageTimer = 0f; damageTimer = 0f;
Puddlec p = Puddles.get(tile); Puddle p = Puddles.get(tile);
puddleFlammability = p != null ? p.getFlammability() / 3f : 0; puddleFlammability = p != null ? p.getFlammability() / 3f : 0;
if(damage){ if(damage){

2
core/src/mindustry/entities/comp/PuddleComp.java
View File

@@ -17,7 +17,7 @@ import static mindustry.Vars.*;
import static mindustry.entities.Puddles.*; import static mindustry.entities.Puddles.*;
@EntityDef(value = {Puddlec.class}, pooled = true) @EntityDef(value = {Puddlec.class}, pooled = true)
@Component(base = true) @Component(base = true, genInterface = false)
abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{ abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{
private static final Rect rect = new Rect(), rect2 = new Rect(); private static final Rect rect = new Rect(), rect2 = new Rect();

2
core/src/mindustry/entities/comp/WorldLabelComp.java
View File

@@ -12,7 +12,7 @@ import mindustry.ui.*;
/** Component/entity for labels in world space. Useful for servers. Does not save in files - create only on world load. */ /** Component/entity for labels in world space. Useful for servers. Does not save in files - create only on world load. */
@EntityDef(value = {WorldLabelc.class}, serialize = false) @EntityDef(value = {WorldLabelc.class}, serialize = false)
@Component(base = true) @Component(base = true, genInterface = false)
public abstract class WorldLabelComp implements Posc, Drawc, Syncc{ public abstract class WorldLabelComp implements Posc, Drawc, Syncc{
@Import int id; @Import int id;
@Import float x, y; @Import float x, y;