Draft: DAC + MapManager mapFolder

core/src/main/java/fr/efreicraft/ludos/core/games/annotations/GameMetadata.java

@@ -18,6 +18,12 @@
      */
     String name();
 
+    /**
+     * Nom du dossier de la map.
+     * @return Nom du dossier de la map.
+     */
+    String mapFolder() default "";
+
     /**
      * Couleur du jeu.
      * @return Couleur du jeu.

core/src/main/java/fr/efreicraft/ludos/core/maps/MapManager.java

@@ -74,6 +74,14 @@ public void runManager() {
         setupLobbyWorld();
     }
 
+    private String getMapFolder(Game game) {
+        if (game.getMetadata().mapFolder().isEmpty()) {
+            return game.getMetadata().name();
+        } else {
+            return game.getMetadata().mapFolder();
+        }
+    }
+
     /**
      * Répertorie les cartes disponibles d'un jeu, accompagnées de leur type.
      * Cette fonction est appelée à chaque changement de jeu.
@@ -82,7 +90,7 @@ public void runManager() {
     public void setupCurrentGameMaps(Game game) {
         if (!this.currentGameMaps.isEmpty()) clearGameMaps();
 
-        File dataFolder = new File(Core.get().getPlugin().getDataFolder(), "game_maps/" + game.getMetadata().name());
+        File dataFolder = new File(Core.get().getPlugin().getDataFolder(), "game_maps/" + getMapFolder(game));
         if(dataFolder.exists()) {
             for (File file : Objects.requireNonNull(dataFolder.listFiles())) {
                 if (file.isFile() && file.getName().endsWith(".schem")) {
@@ -210,7 +218,7 @@ private ParseMapArgs loadSchematicMap(String mapName) throws MapLoadingException
 
         try {
             schematic = SchematicUtils.loadSchematic(
-                    Core.get().getGameManager().getCurrentGame().getMetadata().name() + "/" + mapName
+                    getMapFolder(Core.get().getGameManager().getCurrentGame()) + "/" + mapName
             );
         } catch (IOException e) {
             WorldUtils.deleteWorld(world);
@@ -272,12 +280,19 @@ private ParseMapArgs loadSchematicMap(String mapName) throws MapLoadingException
     private ParseMapArgs loadFolderMap(String mapName) throws MapLoadingException {
         Core.get().getLogger().log(Level.INFO, "Copying world folder {0}...", mapName);
 
-        File sourceFolder = new File(Core.get().getPlugin().getDataFolder(),
-                "game_maps/" + Core.get().getGameManager().getCurrentGame().getMetadata().name() + "/" + mapName);
-        if (!sourceFolder.isDirectory()) throw new MapLoadingException(mapName + " n'est pas un dossier ou n'existe pas.");
-
-        Core.get().getLogger().log(Level.INFO, "Path is {0}", Bukkit.getPluginsFolder().getAbsolutePath().substring(0, Bukkit.getPluginsFolder().getAbsolutePath().lastIndexOf(File.separatorChar)));
-        File destination = new File(Bukkit.getPluginsFolder().getAbsolutePath().substring(0, Bukkit.getPluginsFolder().getAbsolutePath().lastIndexOf(File.separatorChar)));
+        File sourceFolder = new File(
+                Core.get().getPlugin().getDataFolder(),
+                "game_maps/" + getMapFolder(Core.get().getGameManager().getCurrentGame()) + "/" + mapName
+        );
+        if (!sourceFolder.isDirectory())
+            throw new MapLoadingException(mapName + " n'est pas un dossier ou n'existe pas.");
+
+        File destination = new File(
+                Bukkit.getPluginsFolder().getAbsolutePath().substring(
+                        0,
+                        Bukkit.getPluginsFolder().getAbsolutePath().lastIndexOf(File.separatorChar)
+                )
+        );
 
         try {
             FileUtils.copyDirectory(sourceFolder, new File(destination, WorldUtils.getNormalizedWorldName(mapName)));
@@ -288,14 +303,19 @@ private ParseMapArgs loadFolderMap(String mapName) throws MapLoadingException {
         org.bukkit.World world = WorldUtils.createWorld(mapName);
         if (Core.get().getGameManager().getCurrentGame() != null) {
             Block spongeBlock = world.getSpawnLocation().getBlock();
-            if (spongeBlock.getType() != Material.SPONGE) throw new MapLoadingException("World spawn is not The Sponge Block");
+            if (spongeBlock.getType() != Material.SPONGE)
+                throw new MapLoadingException("World spawn is not The Sponge Block");
             Sign sign = (Sign) world.getBlockAt(spongeBlock.getLocation().add(0, 1, 0)).getState();
 
             int[] coord1;
             int[] coord2;
             try {
-                coord1 = Arrays.stream(((TextComponent) sign.line(2)).content().split(" ")).mapToInt(Integer::parseInt).toArray();
-                coord2 = Arrays.stream(((TextComponent) sign.line(3)).content().split(" ")).mapToInt(Integer::parseInt).toArray();
+                coord1 = Arrays.stream(((TextComponent) sign.line(2)).content().split(" "))
+                        .mapToInt(Integer::parseInt)
+                        .toArray();
+                coord2 = Arrays.stream(((TextComponent) sign.line(3)).content().split(" "))
+                        .mapToInt(Integer::parseInt)
+                        .toArray();
             } catch (NumberFormatException e) {
                 throw new MapLoadingException("Bad coords given on the map description Map");
             }

games/dac/build.gradle.kts

@@ -0,0 +1,23 @@
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
+
+plugins {
+    `java-library`
+    id("net.minecrell.plugin-yml.bukkit") version "0.5.2" // Generates plugin.yml
+}
+
+dependencies {
+    implementation(project(":core"))
+
+    compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
+
+    compileOnly("fr.efreicraft:ECATUP:latest.integration")
+}
+
+bukkit {
+    load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
+    name = "LudosDAC"
+    main = "fr.efreicraft.ludos.games.dac.Main"
+    apiVersion = "1.19"
+    authors = listOf("Nat.io")
+    prefix = "DAC"
+}

games/dac/src/main/java/fr/efreicraft/ludos/games/dac/EventListener.java

@@ -0,0 +1,40 @@
+package fr.efreicraft.ludos.games.dac;
+
+import fr.efreicraft.ludos.core.Core;
+import fr.efreicraft.ludos.core.players.LudosPlayer;
+import fr.efreicraft.ludos.core.utils.MessageUtils;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+public record EventListener(GameLogic dac) implements Listener {
+
+    @EventHandler
+    public void onPlayerMove(PlayerMoveEvent event) {
+        if (!event.hasChangedBlock()) {
+            return;
+        }
+        LudosPlayer player = Core.get().getPlayerManager().getPlayer(event.getPlayer());
+        if (!player.getTeam().isPlayingTeam()) {
+            return;
+        }
+        if (this.dac.isInBassin(event.getTo())) {
+            dac.onPlayerInBassin(player);
+        } else if (this.dac.isOnGround(event.getTo().getY())) {
+            dac.onPlayerTouchingGround(player);
+        }
+    }
+
+
+    @EventHandler
+    public void onDamage(EntityDamageEvent event) {
+        if (event.getEntity() instanceof org.bukkit.entity.Player bukkitPlayer) {
+            LudosPlayer player = Core.get().getPlayerManager().getPlayer(bukkitPlayer);
+            if (!player.getTeam().isPlayingTeam()) {
+                return;
+            }
+            event.setDamage(0);
+        }
+    }
+}

games/dac/src/main/java/fr/efreicraft/ludos/games/dac/GameLogic.java

@@ -0,0 +1,129 @@
+package fr.efreicraft.ludos.games.dac;
+
+import fr.efreicraft.ludos.core.Core;
+import fr.efreicraft.ludos.core.maps.points.SpawnPoint;
+import fr.efreicraft.ludos.core.players.LudosPlayer;
+import fr.efreicraft.ludos.core.teams.Team;
+import fr.efreicraft.ludos.core.utils.ActionBarUtils;
+import fr.efreicraft.ludos.core.utils.MessageUtils;
+import fr.efreicraft.ludos.core.utils.TitleUtils;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.command.Command;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+
+public class GameLogic {
+    private Location bassinPosition;
+    private Location plateformePosition;
+
+    private Location spawnPosition ;
+
+    private Location boundary1Position;
+
+    private Location boundary2Position;
+
+    private int round = 1;
+
+    private int numberOfPlayers;
+
+    private ArrayList<LudosPlayer> players = new ArrayList<>();
+
+
+
+    public void setBassinLocation(Location bassinLocation) {
+        this.bassinPosition = bassinLocation;
+    }
+    public void setPlateformeLocation(Location plateformeLocation) {
+        this.plateformePosition = plateformeLocation.getBlock().getLocation();
+        this.plateformePosition.setPitch(0);
+        this.plateformePosition.setYaw(180);
+    }
+    public void setNumberOfPlayers(int numberOfPlayers) {
+        this.numberOfPlayers = numberOfPlayers;
+    }
+    public void setPlateformeBoundaries(Location boundary1Location, Location boundary2Location) {
+        this.boundary1Position = boundary1Location;
+        this.boundary2Position = boundary2Location;
+    }
+
+    public void setSpawnPosition(Location spawnLocation) {
+        this.spawnPosition = spawnLocation;
+    }
+    public boolean isInBassin(Location position) {
+        return bassinPosition.getBlockY() > position.getY() & bassinPosition.getBlockY()-2<position.getY() & bassinPosition.getBlockX() +4> position.getX() & bassinPosition.getBlockX() -4< position.getX() & bassinPosition.getBlockZ() +4> position.getZ() & bassinPosition.getBlockZ() -4< position.getZ();
+    }
+
+    public boolean isOnGround(double positionY){return bassinPosition.getBlockY()==positionY;}
+
+    public void onPlayerInBassin(LudosPlayer player) {
+        player.sendMessage(MessageUtils.ChatPrefix.GAME, "Tombé dans l'eau");
+        Core.get().getMapManager().getCurrentMap().getWorld().setBlockData(new Location(Core.get().getMapManager().getCurrentMap().getWorld(),player.entity().getLocation().getBlockX(),bassinPosition.getY()-1,player.entity().getLocation().getBlockZ()), Material.BLACK_CONCRETE.createBlockData());
+        player.entity().teleport(this.spawnPosition);
+        nextPlayer(player);
+
+    }
+
+    public void movePlateforme(int round){
+        if (!(round==1)){
+        int decalagePlateforme=30*(round-1);
+        for (int y=this.boundary2Position.getBlockY();y>=this.boundary1Position.getBlockY();y--) {
+            for (int z = this.boundary2Position.getBlockZ(); z <= this.boundary1Position.getBlockZ(); z++) {
+                for (int x = this.boundary2Position.getBlockX(); x <= this.boundary1Position.getBlockX(); x++) {
+                    Core.get().getMapManager().getCurrentMap().getWorld().getBlockAt(x, y+decalagePlateforme, z).setType(Core.get().getMapManager().getCurrentMap().getWorld().getBlockAt(x, y, z).getType());
+                    Core.get().getMapManager().getCurrentMap().getWorld().getBlockAt(x, y, z).setType(Material.AIR);
+                }
+            }}
+        this.plateformePosition.setY(this.plateformePosition.getY()+decalagePlateforme);
+        }
+    }
+
+    public void onPlayerTouchingGround(LudosPlayer player) {
+        player.sendMessage(MessageUtils.ChatPrefix.GAME, "Vous êtes tombé sur une bloc ! Vous êtes éliminé !");
+        player.setTeam(Core.get().getTeamManager().getTeam("SPECTATORS"));
+        player.entity().setGameMode(org.bukkit.GameMode.SPECTATOR);
+        players.remove(player);
+        nextPlayer(player);
+
+    }
+
+    public void nextPlayer(LudosPlayer player) {
+        player.sendMessage(MessageUtils.ChatPrefix.GAME, "Il reste "+players.size()+" joueurs");
+        if (players.size()==1){
+            TitleUtils.broadcastTitle(Core.get().getGameManager().getCurrentGame().getMetadata().color() + "Victoire de "+players.get(0).entity().getName(), "", 0, 2, 0.5f);
+
+        }
+        else if (players.size()<Math.ceil(numberOfPlayers/round)+Math.abs(round%2-1)){
+            this.round++;
+            playRound(this.round);
+        }
+        else{
+        for (LudosPlayer currentPlayer : players) {
+            if (currentPlayer == player && players.lastIndexOf(player)<players.size()) {
+                players.iterator().next().entity().teleport(this.plateformePosition);
+            }
+            else{
+                players.get(0).entity().teleport(this.plateformePosition);
+            }
+
+        }
+    }}
+
+    public void setPlayingPlayers(){
+        this.players.addAll(Core.get().getTeamManager().getTeam("PLAYERS").getPlayers());
+    }
+    public void playRound(int round){
+        TitleUtils.broadcastTitle(Core.get().getGameManager().getCurrentGame().getMetadata().color() + "Round "+round, "", 0, 2, 0.5f);
+        movePlateforme(round);
+        players.get(0).entity().teleport(this.plateformePosition);
+    }
+
+    public void onGameStart() {
+        setNumberOfPlayers(Core.get().getTeamManager().getTeam("PLAYERS").getPlayers().size());
+        setPlayingPlayers();
+        playRound(1);
+    }
+}