1.2.4

src/main/java/fr/yuki/yrpf/YukiRPFrameworkPlugin.java

@@ -172,6 +172,7 @@ public void onEnable() {
             Onset.registerRemoteEvent("Vehicle:OnHornCasted");
             Onset.registerRemoteEvent("Character:HandsUp");
             Onset.registerRemoteEvent("Phone:DeleteContact");
+            Onset.registerRemoteEvent("WUI:RequestSync");
 
             // Init discord bot
             if(!WorldManager.getServerConfig().getDiscordBotToken().equals("")) {
@@ -615,6 +616,10 @@ public void onRemoteEvent(PlayerRemoteEvent evt) {
                 case "Phone:DeleteContact":
                     PhoneManager.handleDeletePhoneContact(evt.getPlayer(), (evt.getArgs()[0]).toString());
                     break;
+
+                case "WUI:RequestSync":
+                    WorldUIManager.handleRequestSync(evt.getPlayer(), Integer.parseInt((evt.getArgs()[0]).toString()));
+                    break;
             }
         }
         catch (Exception ex) {

src/main/java/fr/yuki/yrpf/luaapi/LuaAPIManager.java

@@ -13,6 +13,7 @@
 import fr.yuki.yrpf.luaapi.vehicle.*;
 import fr.yuki.yrpf.luaapi.worldui.CreateWorldUIEF;
 import fr.yuki.yrpf.luaapi.worldui.DestroyWUIEF;
+import fr.yuki.yrpf.luaapi.worldui.SetImageWUIEF;
 import fr.yuki.yrpf.luaapi.worldui.SetProgressWUIEF;
 import net.onfirenetwork.onsetjava.Onset;
 
@@ -85,5 +86,6 @@ public static void init() {
         Onset.getServer().addFunctionExport("CreateWUI", new CreateWorldUIEF());
         Onset.getServer().addFunctionExport("DestroyWUI", new DestroyWUIEF());
         Onset.getServer().addFunctionExport("SetProgressWUI", new SetProgressWUIEF());
+        Onset.getServer().addFunctionExport("SetImageWUI", new SetImageWUIEF());
     }
 }

src/main/java/fr/yuki/yrpf/luaapi/map/AddMapCustomMarkerEF.java

@@ -0,0 +1,10 @@
+package fr.yuki.yrpf.luaapi.map;
+
+import net.onfirenetwork.onsetjava.plugin.ExportFunction;
+
+public class AddMapCustomMarkerEF implements ExportFunction {
+    @Override
+    public Object call(Object[] objects) {
+        return null;
+    }
+}

src/main/java/fr/yuki/yrpf/luaapi/worldui/CreateWorldUIEF.java

@@ -1,6 +1,7 @@
 package fr.yuki.yrpf.luaapi.worldui;
 
 import fr.yuki.yrpf.manager.WorldUIManager;
+import fr.yuki.yrpf.world.WImageContainerWUI;
 import fr.yuki.yrpf.world.WProgressBarWUI;
 import fr.yuki.yrpf.world.WorldUI;
 import net.onfirenetwork.onsetjava.data.Vector;
@@ -19,6 +20,11 @@ public Object call(Object[] objects) {
                 worldUI = new WProgressBarWUI(position, rotation, Integer.parseInt(objects[6].toString()), Integer.parseInt(objects[7].toString()),
                         objects[8].toString());
                 break;
+
+            case "wImageContainer":
+                worldUI = new WImageContainerWUI(position, rotation, Integer.parseInt(objects[6].toString()), Integer.parseInt(objects[7].toString()),
+                        objects[8].toString());
+                break;
         }
         if(worldUI == null) return -1;
         WorldUIManager.getWorldUIS().add(worldUI);

src/main/java/fr/yuki/yrpf/luaapi/worldui/SetImageWUIEF.java

@@ -0,0 +1,21 @@
+package fr.yuki.yrpf.luaapi.worldui;
+
+import fr.yuki.yrpf.manager.WorldUIManager;
+import fr.yuki.yrpf.world.WImageContainerWUI;
+import fr.yuki.yrpf.world.WProgressBarWUI;
+import fr.yuki.yrpf.world.WorldUI;
+import net.onfirenetwork.onsetjava.plugin.ExportFunction;
+
+public class SetImageWUIEF implements ExportFunction {
+    @Override
+    public Object call(Object[] objects) {
+        WorldUI worldUI = WorldUIManager.findWorldUIByID(Integer.parseInt(objects[0].toString()));
+        if(worldUI == null) return false;
+        if(!worldUI.getUiType().equals("wImageContainer")) {
+            return false;
+        }
+        WImageContainerWUI wImageContainerWUI = (WImageContainerWUI)worldUI;
+        wImageContainerWUI.setImageUrl(objects[1].toString());
+        return true;
+    }
+}

src/main/java/fr/yuki/yrpf/manager/MapManager.java

@@ -14,11 +14,13 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.util.HashMap;
 
 public class MapManager {
     private static GameMapConfig mapConfig;
     @Getter @Setter
     private static int markerId = 1;
+    public HashMap<String, String> customMarkers = new HashMap<>();
 
     public static void init() throws FileNotFoundException {
         new File("yrpf").mkdir();

src/main/java/fr/yuki/yrpf/manager/WorldManager.java

@@ -85,6 +85,20 @@ public static void init() throws SQLException, IOException {
         outfitPoints = Repo.get(OutfitPoint.class).all();
         Onset.print("Loaded " + outfitPoints.size() + " outfit point(s) from the database");
         spawnOutfitPoints();
+
+        Onset.timer(60000 * 5, () -> {
+            saveAll();
+        });
+    }
+
+    public static void saveAll() {
+        Onset.print("Autosave players ..");
+        for (Player player : Onset.getPlayers()) {
+            try {
+                savePlayer(player);
+            }catch (Exception ex) {}
+        }
+        Onset.print("Autosave done");
     }
 
     public static void initServerConfig() throws IOException {

src/main/java/fr/yuki/yrpf/manager/WorldUIManager.java

@@ -2,6 +2,8 @@
 
 import fr.yuki.yrpf.world.WorldUI;
 import lombok.Getter;
+import net.onfirenetwork.onsetjava.Onset;
+import net.onfirenetwork.onsetjava.entity.Player;
 
 import java.util.ArrayList;
 
@@ -12,4 +14,11 @@ public class WorldUIManager {
     public static WorldUI findWorldUIByID(int id) {
         return worldUIS.stream().filter(x -> x.getId() == id).findFirst().orElse(null);
     }
+
+    public static void handleRequestSync(Player player, int uiID) {
+        Onset.print("Request sync for WUI id="+uiID);
+        WorldUI worldUI = findWorldUIByID(uiID);
+        if(worldUI == null) return;
+        worldUI.sync(player);
+    }
 }

src/main/java/fr/yuki/yrpf/net/payload/SetImageWUIPayload.java

@@ -0,0 +1,19 @@
+package fr.yuki.yrpf.net.payload;
+
+public class SetImageWUIPayload {
+    private String imageUrl;
+    private String type;
+
+    public SetImageWUIPayload(String imageUrl) {
+        this.type = "SET_IMAGE_WUI";
+        this.imageUrl = imageUrl;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public String getType() {
+        return type;
+    }
+}

src/main/java/fr/yuki/yrpf/world/WImageContainerWUI.java

@@ -0,0 +1,29 @@
+package fr.yuki.yrpf.world;
+
+import com.google.gson.Gson;
+import fr.yuki.yrpf.net.payload.SetImageWUIPayload;
+import fr.yuki.yrpf.net.payload.SetProgressWUIPayload;
+import net.onfirenetwork.onsetjava.data.Vector;
+import net.onfirenetwork.onsetjava.entity.Player;
+
+public class WImageContainerWUI extends WorldUI {
+    private String imageUrl = "";
+
+    public WImageContainerWUI(Vector position, Vector rotation, int width, int height, String uiType) {
+        super(position, rotation, width, height, uiType);
+    }
+
+    public void setImageUrl(String url) {
+        if(url.startsWith("http")) {
+            this.imageUrl = url;
+        } else {
+            this.imageUrl = "../../../../" + url;
+        }
+        this.syncAll();
+    }
+
+    @Override
+    public void sync(Player player) {
+        this.dispatchToPlayerUI(player, new Gson().toJson(new SetImageWUIPayload(this.imageUrl)));
+    }
+}

src/main/java/fr/yuki/yrpf/world/WProgressBarWUI.java

@@ -19,14 +19,11 @@ public WProgressBarWUI(Vector position, Vector rotation, int width, int height,
 
     public void setProgress(int progress) {
         this.progress = progress;
-        this.sync();
+        this.syncAll();
     }
 
     @Override
-    public void sync() {
-        Onset.print("sync progress: " + this.progress);
-        for(Player player : this.getPlayersInRange()) {
-            this.dispatchToPlayerUI(player, new Gson().toJson(new SetProgressWUIPayload(this.progress)));
-        }
+    public void sync(Player player) {
+        this.dispatchToPlayerUI(player, new Gson().toJson(new SetProgressWUIPayload(this.progress)));
     }
 }

src/main/java/fr/yuki/yrpf/world/WorldUI.java

@@ -41,10 +41,11 @@ public WorldUI(Vector position, Vector rotation, int width, int height, String u
         this.spawn();
     }
 
-    public abstract void sync();
+    public abstract void sync(Player player);
 
     private void spawn() {
         this.worldObject = Onset.getServer().createObject(this.position, 1);
+        this.worldObject.setRotation(this.rotation);
         this.worldObject.setProperty("isWorldUI", "true", true);
         this.worldObject.setProperty("uiID", this.id, true);
         this.worldObject.setProperty("uiType", this.uiType, true);
@@ -60,6 +61,12 @@ public void destroy() {
         }
     }
 
+    public void syncAll() {
+        for(Player player : this.getPlayersInRange()) {
+            this.sync(player);
+        }
+    }
+
     protected ArrayList<Player> getPlayersInRange() {
         return new ArrayList<>(Onset.getPlayers().stream().filter(x -> x.getLocation().distance(this.position) <= this.streamDistance)
                 .collect(Collectors.toList()));