bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make engine instantiates MapInitializer instead of MapHandler as a map handler

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2023-11-02 15:58:58 +01:00
parent 4bc8999adf
commit 76adb78867
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/bartlomiejpluta/base/internal/map/MapInitializer.java
View File

@@ -6,5 +6,5 @@ import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.map.model.GameMap; import com.bartlomiejpluta.base.api.map.model.GameMap;
public interface MapInitializer { public interface MapInitializer {
void run(final Context context, final MapHandler handler, final GameMap map, final ObjectLayer layer); void initialize();
} }

16
engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java
View File

@@ -86,7 +86,7 @@ public class DefaultMapManager implements MapManager {
throw new AppException("The map asset with UID: [%s] has not been loaded yet", uid); throw new AppException("The map asset with UID: [%s] has not been loaded yet", uid);
} }
var handlerClassName = map.getHandler(); var handlerClassName = format("com.bartlomiejpluta.base.generated.map.MapInitializer_%s", uid.replace("-", "_"));
log.info("Creating new handler: [{}] for the map with ID: [{}]", handlerClassName, uid); log.info("Creating new handler: [{}] for the map with ID: [{}]", handlerClassName, uid);
var handlerClass = classLoader.<MapHandler>loadClass(handlerClassName); var handlerClass = classLoader.<MapHandler>loadClass(handlerClassName);
handler = handlerClass.getConstructor().newInstance(); handler = handlerClass.getConstructor().newInstance();
@@ -94,18 +94,8 @@ public class DefaultMapManager implements MapManager {
handler.onCreate(context, map); handler.onCreate(context, map);
var layers = map.getLayers(); var initializer = (MapInitializer) handler;
for (var layer : layers) { initializer.initialize();
if (layer instanceof ObjectLayer) {
var packageName = "com.bartlomiejpluta.base.generated.map";
var purifiedUid = uid.replace("-", "_");
var layerIndex = layers.indexOf(layer);
var className = format("%s.MapInitializer_%s$$Layer%d", packageName, purifiedUid, layerIndex);
var initializerClass = classLoader.<MapInitializer>loadClass(className);
var initializer = initializerClass.getConstructor().newInstance();
initializer.run(context, handler, map, (ObjectLayer) layer);
}
}
} }
return handler; return handler;