modify restEnable + add lookup test

Author: elebras1

src/main/java/com/github/elebras1/flecs/World.java

@@ -847,34 +847,27 @@ public void enableRest(short port) {
         flecs_h.FlecsStatsImport(this.worldSeg);
         flecs_h.FlecsMetricsImport(this.worldSeg);
 
-        try (Arena arena = Arena.ofConfined()) {
-            MemorySegment restCompName = arena.allocateFrom("flecs.rest.Rest");
-            long restCompId = flecs_h.ecs_lookup(this.worldSeg, restCompName);
-
-            if (restCompId == 0) {
-                throw new IllegalStateException("Failed to find flecs.rest.Rest component.");
-            }
-
-            MemorySegment restDataSeg = arena.allocate(32);
-            restDataSeg.set(JAVA_SHORT, 0, port);
+        long restCompId = flecs_h.FLECS_IDEcsRestID_();
+        if( restCompId == 0) {
+            throw new IllegalStateException("Failed to find EcsRest component.");
+        }
 
-            flecs_h.ecs_set_id(this.worldSeg, restCompId, restCompId, 32, restDataSeg);
+        try (Arena arena = Arena.ofConfined()) {
+            MemorySegment restDataSeg = EcsRest.allocate(arena);
+            EcsRest.port(restDataSeg, port);
+            flecs_h.ecs_set_id(this.worldSeg, restCompId, restCompId, EcsRest.sizeof(), restDataSeg);
         }
     }
 
     public void disableRest() {
         this.checkDestroyed();
 
-        try (Arena arena = Arena.ofConfined()) {
-            MemorySegment restCompNameSeg = arena.allocateFrom("flecs.rest.Rest");
-            long restCompId = flecs_h.ecs_lookup(this.worldSeg, restCompNameSeg);
-
-            if( restCompId == 0) {
-                throw new IllegalStateException("Failed to find flecs.rest.Rest component. Make sure FlecsRest module is imported.");
-            }
-
-            flecs_h.ecs_remove_id(this.worldSeg, restCompId, restCompId);
+        long restCompId = flecs_h.FLECS_IDEcsRestID_();
+        if( restCompId == 0) {
+            throw new IllegalStateException("Failed to find EcsRest component.");
         }
+
+        flecs_h.ecs_remove_id(this.worldSeg, restCompId, restCompId);
     }
 
     public void destroy() {
@@ -906,3 +899,4 @@ public String toString() {
     }
 }
 
+

src/test/java/com/github/elebras1/flecs/WorldTest.java

@@ -2,6 +2,7 @@
 
 import com.github.elebras1.flecs.component.Health;
 import com.github.elebras1.flecs.component.Ideology;
+import com.github.elebras1.flecs.util.FlecsConstants;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -97,6 +98,34 @@ void setEntityRangeTest() {
         }
     }
 
+    @Test
+    void testLookup() {
+        this.world.entity("test_entity");
+        long entityId = this.world.lookup("test_entity");
+        assertTrue(entityId > 0);
+    }
+
+    @Test
+    void testLookupWithSystemCreateBefore() {
+        this.world.enableRest((short) 27750);
+        this.world.component(Health.class);
+
+        this.world.system("system_test").kind(FlecsConstants.EcsOnUpdate).with(Health.class).iter(iter -> {
+            long entityId = iter.world().lookup("test_entity");
+            assertTrue(entityId > 0);
+            assertEquals(10, iter.count());
+        });
+
+        for(int i = 0; i < 10; i++) {
+            long entityId = this.world.entity();
+            EntityView entity = this.world.obtainEntityView(entityId);
+            entity.set(new Health(100));
+        }
+
+        this.world.entity("test_entity");
+        this.world.progress(1);
+    }
+
     @AfterEach
     void tearDown() {
         this.world.destroy();