Refonte de la génération de la dimension des rêves

src/main/java/fr/openmc/core/OMCBootstrap.java

@@ -1,22 +1,18 @@
 package fr.openmc.core;
 
+import fr.openmc.core.bootstrap.integration.DatapackLoader;
 import fr.openmc.core.bootstrap.integration.OMCLogger;
 import fr.openmc.core.hooks.itemsadder.ItemsAdderHook;
 import fr.openmc.core.registry.enchantments.CustomEnchantmentRegistry;
 import fr.openmc.core.utils.text.messages.TranslationManager;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
 import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
-import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import io.papermc.paper.registry.event.RegistryEvents;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Locale;
-import java.util.Objects;
 
 /**
  * Bootstrap Paper du plugin OpenMC.
@@ -35,18 +31,8 @@ public class OMCBootstrap implements PluginBootstrap {
     public void bootstrap(@NotNull BootstrapContext context) {
         OMCLogger.setBootstrapLogger(context.getLogger());
 
-        // ** LOAD DATAPACK **
-        context.getLifecycleManager().registerEventHandler(LifecycleEvents.DATAPACK_DISCOVERY.newHandler(
-                event -> {
-                    try {
-                        URI uri = Objects.requireNonNull(getClass().getResource("/datapack")).toURI();
-
-                        event.registrar().discoverPack(uri, "omc");
-                    } catch (URISyntaxException | IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-        ));
+        // ** LOAD DATAPACKS **
+        DatapackLoader.loadAllInResource(context);
 
         // ** LOAD ITEMS ADDER NAMESPACES **
         ItemsAdderHook.copyContentsToItemsAdder(context, "contents");

src/main/java/fr/openmc/core/OMCPlugin.java

@@ -24,7 +24,6 @@
 import fr.openmc.core.features.displays.holograms.HologramLoader;
 import fr.openmc.core.features.displays.scoreboards.ScoreboardManager;
 import fr.openmc.core.features.dream.DreamManager;
-import fr.openmc.core.features.dream.generation.DreamDimensionManager;
 import fr.openmc.core.features.economy.BankManager;
 import fr.openmc.core.features.economy.EconomyManager;
 import fr.openmc.core.features.economy.TransactionsManager;
@@ -203,9 +202,6 @@ public void loadAfterItemsAdder() {
                 .filter(f -> f instanceof LoadAfterItemsAdder)
                 .forEachOrdered(Feature::startInit);
 
-        // todo: sera supprimé dans https://github.com/ServerOpenMC/PluginV2/pull/1168
-        DreamDimensionManager.postInit();
-
         if (WorldGuardHook.isEnable()) {
             ParticleUtils.spawnParticlesInRegion("spawn", Bukkit.getWorld("world"), Particle.CHERRY_LEAVES, 50, 70, 130);
         }

src/main/java/fr/openmc/core/bootstrap/integration/DatapackLoader.java

@@ -0,0 +1,49 @@
+package fr.openmc.core.bootstrap.integration;
+
+import fr.openmc.core.utils.FilesUtils;
+import io.papermc.paper.plugin.bootstrap.BootstrapContext;
+import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+@SuppressWarnings("UnstableApiUsage")
+public class DatapackLoader {
+    /**
+     * Charge tout les datapacks qui sont dans la ressource resources/datapacks
+     */
+    public static void loadAllInResource(BootstrapContext context) {
+        Path extractedDatapacks = extractDatapacks();
+
+        try (Stream<Path> paths = Files.list(extractedDatapacks)){
+            paths.forEach(pathDir ->
+                    context.getLifecycleManager().registerEventHandler(LifecycleEvents.DATAPACK_DISCOVERY.newHandler(
+                    event -> {
+                        try {
+                            event.registrar().discoverPack(pathDir.toUri(), pathDir.getFileName().toString());
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    })));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Extrait tout les datapacks dans un dossier temporaire "omc-datapacks" et retourne le path de ce dossier.
+     */
+    public static Path extractDatapacks() {
+        try {
+            Path tempDir = Files.createTempDirectory("omc-datapacks");
+
+            FilesUtils.copyResourceFolder("datapacks", tempDir.toFile());
+
+            return tempDir;
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to extract datapacks", e);
+        }
+    }
+}

src/main/java/fr/openmc/core/features/animations/AnimationsManager.java

@@ -78,7 +78,7 @@ public static void loadAllAnimations(OMCPlugin plugin) {
         for (Animation animation : Animation.values()) {
             String animationName = animation.getNameAnimation();
 
-            String resourcePath = "data/animations/" + animationName + ".animation.json";
+            String resourcePath = "contents/omc_animations/" + animationName + ".animation.json";
             JsonObject animationJson = loadAnimation(plugin, resourcePath);
 
             JsonObject animations = animationJson.getAsJsonObject("animations");

src/main/java/fr/openmc/core/features/cube/listeners/CubeListener.java

@@ -5,7 +5,7 @@
 import fr.openmc.core.features.cube.events.ExitCubeZoneEvent;
 import fr.openmc.core.features.cube.multiblocks.MultiBlock;
 import fr.openmc.core.features.cube.multiblocks.MultiBlockManager;
-import fr.openmc.core.features.dream.generation.DreamDimensionManager;
+import fr.openmc.core.features.dream.DreamUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.attribute.Attribute;
@@ -56,7 +56,7 @@ public void onPlayerMove(PlayerMoveEvent event) {
     public void onPlayerEnterAndLeaveCubeZone(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         if (!player.getLocation().getWorld().getName().equals("world")
-                && !player.getLocation().getWorld().getName().equals(DreamDimensionManager.DIMENSION_NAME)) return;
+                && !DreamUtils.isInDreamWorld(player)) return;
 
         boolean insideAny = false;
         Cube cube = null;

src/main/java/fr/openmc/core/features/cube/multiblocks/MultiBlockManager.java

@@ -11,8 +11,8 @@
 import fr.openmc.core.features.cube.CubeCommands;
 import fr.openmc.core.features.cube.listeners.CubeListener;
 import fr.openmc.core.features.cube.listeners.RepulseEffectListener;
+import fr.openmc.core.features.dream.DreamDimensionManager;
 import fr.openmc.core.features.dream.DreamUtils;
-import fr.openmc.core.features.dream.generation.DreamDimensionManager;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/fr/openmc/core/features/dream/DreamDimensionManager.java

@@ -0,0 +1,74 @@
+package fr.openmc.core.features.dream;
+
+import fr.openmc.core.OMCPlugin;
+import fr.openmc.core.bootstrap.integration.OMCLogger;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.io.IOException;
+
+public class DreamDimensionManager {
+
+    public static final String DIMENSION_NAME = "dream";
+
+    private static File seedFile;
+    private static FileConfiguration seedConfig;
+    private static boolean seedChanged = false;
+
+    public static void init() {
+        seedFile = new File(OMCPlugin.getInstance().getDataFolder() + "/data/dream", "seed.yml");
+        loadSeed();
+    }
+
+    public static void postInit() {
+        World dream = Bukkit.getWorld(DIMENSION_NAME);
+        if (dream == null) return;
+
+        OMCLogger.info("[DreamDimensionManager] Saving seed: {}", dream.getSeed());
+        saveSeed(dream.getSeed());
+    }
+
+    private static void loadSeed() {
+        if (!seedFile.exists()) {
+            OMCLogger.info("Fichier seed.yml manquant, il sera créé au saveSeed().");
+        }
+        seedConfig = YamlConfiguration.loadConfiguration(seedFile);
+    }
+
+    private static void saveSeed(long seed) {
+        seedConfig.set("world_seed", seed);
+        try {
+            seedConfig.save(seedFile);
+        } catch (IOException e) {
+            OMCLogger.error("Cannot save seed dream_world", e);
+        }
+    }
+
+    public static void checkSeed() {
+        long saved = seedConfig.getLong("world_seed", -1);
+
+        World dream = Bukkit.getWorld(DIMENSION_NAME);
+        if (dream == null) return;
+
+        long current = dream.getSeed();
+
+        if (saved == -1) {
+            saveSeed(current);
+            seedChanged = false;
+            return;
+        }
+
+        seedChanged = saved != current;
+
+        if (seedChanged) {
+            saveSeed(current);
+        }
+    }
+
+    public static boolean hasSeedChanged() {
+        return seedChanged;
+    }
+}

src/main/java/fr/openmc/core/features/dream/DreamManager.java

@@ -18,16 +18,13 @@
 import fr.openmc.core.features.city.sub.mayor.perks.Perks;
 import fr.openmc.core.features.dream.commands.AdminDreamCommands;
 import fr.openmc.core.features.dream.commands.DreamCommands;
-import fr.openmc.core.features.dream.generation.DreamBiome;
-import fr.openmc.core.features.dream.generation.DreamDimensionManager;
-import fr.openmc.core.features.dream.generation.listeners.CloudStructureDispenserListener;
-import fr.openmc.core.features.dream.generation.listeners.ReplaceBlockListener;
-import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager;
 import fr.openmc.core.features.dream.listeners.dream.*;
 import fr.openmc.core.features.dream.listeners.registry.CraftingConvertorListener;
 import fr.openmc.core.features.dream.listeners.registry.DreamItemEquipListener;
+import fr.openmc.core.features.dream.listeners.structures.CloudStructureDispenserListener;
 import fr.openmc.core.features.dream.listeners.structures.PlayerEnterStructureListener;
 import fr.openmc.core.features.dream.listeners.structures.PlayerExitStructureListener;
+import fr.openmc.core.features.dream.listeners.structures.ReplaceBlockListener;
 import fr.openmc.core.features.dream.mecanism.cloudfishing.CloudFishingManager;
 import fr.openmc.core.features.dream.mecanism.cold.ColdManager;
 import fr.openmc.core.features.dream.mecanism.metaldetector.MetalDetectorManager;
@@ -74,10 +71,8 @@ public class DreamManager extends Feature implements DatabaseFeature, LoadAfterI
     @Override
     public void init() {
         // ** MANAGERS **
-        DreamDimensionManager.init();
         GlaciteNpcManager.init();
         PlayerCloneNpc.init();
-        DreamStructuresManager.init();
         DreamItemRegistry.init();
         DreamLootTableRegistry.init();
         DreamBlocksRegistry.init();
@@ -125,7 +120,8 @@ public Set<Listener> getListeners() {
                 new PlayerEnterStructureListener(),
                 new PlayerExitStructureListener(),
                 new PlayerFoodChangeListener(),
-                new DreamLootListener()
+                new DreamLootListener(),
+                new SetupDreamDimensionListener()
         );
     }
 

src/main/java/fr/openmc/core/features/dream/DreamUtils.java

@@ -1,6 +1,5 @@
 package fr.openmc.core.features.dream;
 
-import fr.openmc.core.features.dream.generation.DreamDimensionManager;
 import fr.openmc.core.features.dream.models.db.DreamPlayer;
 import fr.openmc.core.utils.text.DateUtils;
 import fr.openmc.core.utils.text.messages.MessageType;

src/main/java/fr/openmc/core/features/dream/displays/DreamScoreboard.java

@@ -5,17 +5,16 @@
 import fr.openmc.core.features.displays.scoreboards.BaseScoreboard;
 import fr.openmc.core.features.dream.DreamManager;
 import fr.openmc.core.features.dream.DreamUtils;
-import fr.openmc.core.features.dream.generation.DreamBiome;
-import fr.openmc.core.features.dream.generation.DreamDimensionManager;
-import fr.openmc.core.features.dream.generation.structures.DreamStructure;
-import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager;
 import fr.openmc.core.features.dream.models.db.DreamPlayer;
+import fr.openmc.core.features.dream.registries.DreamBiome;
+import fr.openmc.core.features.dream.registries.DreamStructure;
 import fr.openmc.core.utils.text.DateUtils;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
@@ -41,7 +40,7 @@ protected void updateTitle(Player player, SternalBoard board) {
 
     @Override
     public void update(Player player, SternalBoard board) {
-        DreamBiome dreamBiome = DreamDimensionManager.getDreamBiome(player);
+        DreamBiome dreamBiome = DreamBiome.getDreamBiome(player);
         DreamPlayer dreamPlayer = DreamManager.getDreamPlayer(player);
 
         List<Component> lines = new ArrayList<>();
@@ -78,9 +77,9 @@ public void update(Player player, SternalBoard board) {
             );
         }
 
-        DreamStructure dreamStructure = DreamStructuresManager.getStructureAt(player.getLocation());
+        DreamStructure dreamStructure = DreamStructure.getDreamStructure(player);
         if (dreamStructure != null) {
-            String nameLocation = dreamStructure.type().getName();
+            String nameLocation = PlainTextComponentSerializer.plainText().serialize(dreamStructure.getName());
             lines.add(text(" • ", NamedTextColor.DARK_GRAY)
                     .append(text(textToSmall("location:"), NamedTextColor.GRAY))
                     .appendSpace()

src/main/java/fr/openmc/core/features/dream/events/PlayerEnterStructureEvent.java

@@ -1,6 +1,6 @@
 package fr.openmc.core.features.dream.events;
 
-import fr.openmc.core.features.dream.generation.structures.DreamStructure;
+import fr.openmc.core.features.dream.registries.DreamStructure;
 import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

src/main/java/fr/openmc/core/features/dream/events/PlayerExitStructureEvent.java

@@ -1,6 +1,6 @@
 package fr.openmc.core.features.dream.events;
 
-import fr.openmc.core.features.dream.generation.structures.DreamStructure;
+import fr.openmc.core.features.dream.registries.DreamStructure;
 import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;