From bcc29e20aee4168f6111078a1177bd45a7bc9757 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 7 Jul 2025 20:03:22 -0400
Subject: [PATCH] Component interface cleanup

---
 core/src/mindustry/entities/Fires.java               | 2 +-
 core/src/mindustry/entities/Puddles.java             | 2 +-
 core/src/mindustry/entities/comp/FireComp.java       | 4 ++--
 core/src/mindustry/entities/comp/PuddleComp.java     | 2 +-
 core/src/mindustry/entities/comp/WorldLabelComp.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java
index e3601e3e31..b4c3c3b70b 100644
--- a/core/src/mindustry/entities/Fires.java
+++ b/core/src/mindustry/entities/Fires.java
@@ -59,7 +59,7 @@ public class Fires{
         if(tile != null){
             Fire fire = get(tile);
             if(fire != null){
-                fire.time(fire.time + intensity * Time.delta);
+                fire.time += intensity * Time.delta;
                 Fx.steam.at(fire);
                 if(fire.time >= fire.lifetime){
                     Events.fire(Trigger.fireExtinguish);
diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java
index cb0bcbe45f..03abdbf272 100644
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -110,7 +110,7 @@ public class Puddles{
     }
 
     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. */
diff --git a/core/src/mindustry/entities/comp/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java
index 14ce9d8b1a..3dd3e9f66b 100644
--- a/core/src/mindustry/entities/comp/FireComp.java
+++ b/core/src/mindustry/entities/comp/FireComp.java
@@ -18,7 +18,7 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 @EntityDef(value = {Firec.class}, pooled = true)
-@Component(base = true)
+@Component(base = true, genInterface = false)
 abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
     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
         if((damageTimer += Time.delta) >= damageDelay){
             damageTimer = 0f;
-            Puddlec p = Puddles.get(tile);
+            Puddle p = Puddles.get(tile);
             puddleFlammability = p != null ? p.getFlammability() / 3f : 0;
 
             if(damage){
diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
index 4fbc555193..24de4045a6 100644
--- a/core/src/mindustry/entities/comp/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -17,7 +17,7 @@ import static mindustry.Vars.*;
 import static mindustry.entities.Puddles.*;
 
 @EntityDef(value = {Puddlec.class}, pooled = true)
-@Component(base = true)
+@Component(base = true, genInterface = false)
 abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{
     private static final Rect rect = new Rect(), rect2 = new Rect();
 
diff --git a/core/src/mindustry/entities/comp/WorldLabelComp.java b/core/src/mindustry/entities/comp/WorldLabelComp.java
index a98dd27fbf..c283ce0bd1 100644
--- a/core/src/mindustry/entities/comp/WorldLabelComp.java
+++ b/core/src/mindustry/entities/comp/WorldLabelComp.java
@@ -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. */
 @EntityDef(value = {WorldLabelc.class}, serialize = false)
-@Component(base = true)
+@Component(base = true, genInterface = false)
 public abstract class WorldLabelComp implements Posc, Drawc, Syncc{
     @Import int id;
     @Import float x, y;