feat: change plugin compatibilities (1.17 -> 1.8-1.16)

Author: aymnms

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .idea/
 out/
+*.iml

SkipNight.iml

@@ -1,16 +1,16 @@
 package fr.aymnms.skipnight;
 
 import fr.aymnms.skipnight.event.SNBed;
+import fr.aymnms.skipnight.event.SNLeave;
 import org.bukkit.Bukkit;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 
 public class EventManager {
 
     public static void registerEvents(final SNMain main) {
         final PluginManager pm = Bukkit.getPluginManager();
-        pm.registerEvents((Listener) new SNBed(main), (Plugin) main);
+        pm.registerEvents(new SNBed(main), main);
+        pm.registerEvents(new SNLeave(main), main);
     }
 
 }

spigot-api-1.17.1-R0.1-20211012.211718-80.jar

@@ -11,7 +11,20 @@ public class SNMain extends JavaPlugin implements Listener
     private ArrayList<Player> PlayerBed;
 
     public SNMain() {
-        this.PlayerBed = new ArrayList<Player>();
+        String version = getServer().getBukkitVersion();
+        String[] parts = version.split("\\.");
+        try {
+            int major = Integer.parseInt(parts[0]);
+            int minor = Integer.parseInt(parts[1].split("-")[0]);
+            if ((major == 1 && minor >= 17) || major > 1) {
+                getLogger().warning("This plugin is no longer required with the playersSleepingPercentage gamerule.");
+                getServer().getPluginManager().disablePlugin(this);
+            }
+        } catch (Exception e) {
+            getLogger().warning("Unable to read Minecraft version. The plugin is activated by default.");
+        }
+
+        this.PlayerBed = new ArrayList<>();
     }
 
     public static SNMain getInstance() {

spigot-api-1.8.8-R0.1-SNAPSHOT.jar

@@ -10,55 +10,65 @@
 
 public class SNBed implements Listener
 {
-    private SNMain main;
+    private final SNMain main;
 
     public SNBed(final SNMain main) {
         this.main = main;
     }
 
     @EventHandler
-    public void joinBed(final PlayerBedEnterEvent e) {
+    public void joinBedEvent(final PlayerBedEnterEvent e) {
         final Player p = e.getPlayer();
+        joinBed(p);
+        skipNight(p);
+    }
+
+    @EventHandler
+    public void leaveBedEvent(final PlayerBedLeaveEvent e) {
+        Player p = e.getPlayer();
+        leaveBed(p);
+    }
+
+    public void leaveBed(final Player p){
+        final int playerLimit = Bukkit.getServer().getOnlinePlayers().size() / 2;
 
-        // if not night or not thundering -> stop
+        this.main.getPB().remove(p);
+        System.out.println("leave: Bedlist: " + this.main.getPB());
+
+        if (this.main.getPB().isEmpty()) {
+            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §7Nobody wants to go to bed anymore!");
+        } else {
+            Bukkit.broadcastMessage("§8§l" + p.getName() + " §r§7has just left the bed §8[§9§l" + this.main.getPB().size() + "§8/§f" + playerLimit + "]");
+        }
+    }
+
+    public void joinBed(Player p) {
         if (p.getWorld().getTime() < 12000L && !p.getWorld().isThundering())
             return;
 
-        final int playerLimit = Bukkit.getServer().getOnlinePlayers().size() / 2;
+        final int playerLimit = Math.max(1, Bukkit.getServer().getOnlinePlayers().size() / 2);
 
         if (!this.main.getPB().contains(p))
             this.main.getPB().add(p);
 
         System.out.println("join: Bedlist: " + this.main.getPB());
 
         if (this.main.getPB().size() == 1)
-            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §9" + this.main.getPB().get(0).getName() + " §r§7souhaite faire passer la nuit §8[§9§l" + this.main.getPB().size() + "§8/§f" + playerLimit + "]");
+            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §9" + this.main.getPB().get(0).getName() + " §r§would to skip the night §8[§9§l" + this.main.getPB().size() + "§8/§f" + playerLimit + "]");
         else if (this.main.getPB().size() > 1)
-            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §9" + p.getName() + " §7vient de rejoindre le lit §8[§9§l" + this.main.getPB().size() + "§8/§f" + playerLimit + "]");
-
-        if (this.main.getPB().size() >= playerLimit) {
-            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §7Le jour se l\u00e8ve.");
-            Bukkit.getWorld("world").setTime(0L);
-            this.main.getPB().clear();
-        }
+            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §9" + p.getName() + " §7has just gone to bed §8[§9§l" + this.main.getPB().size() + "§8/§f" + playerLimit + "]");
     }
 
-    @EventHandler
-    public void leaveBed(final PlayerBedLeaveEvent e) {
-        final Player p = e.getPlayer();
-        final int yay = Bukkit.getServer().getOnlinePlayers().size() / 2;
-
-        if (p.getWorld().getTime() > 12000L || p.getWorld().isThundering()){
-            if (this.main.getPB().contains(p))
-                this.main.getPB().remove(p);
+    public void skipNight(Player p) {
+        if (p.getWorld().getTime() < 12000L && !p.getWorld().isThundering())
+            return;
 
-            System.out.println("leave: Bedlist: " + this.main.getPB());
+        final int playerLimit = Math.max(1, Bukkit.getServer().getOnlinePlayers().size() / 2);
 
-            if (this.main.getPB().size() == 0 && (p.getWorld().getTime() > 12000L || p.getWorld().isThundering()))
-                Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §7Plus personne ne souhaite se coucher !");
-            else if (SNMain.getInstance().getPB().size() > 0 && p.getWorld().getTime() > 12000L)
-                Bukkit.broadcastMessage("§8§l" + p.getName() + " §r§7vient de quitter le lit §8[§9§l" + this.main.getPB().size() + "§8/§f" + yay + "]");
+        if (this.main.getPB().size() >= playerLimit) {
+            Bukkit.broadcastMessage("§8[§rSkip§9Night§8] §7The sun rises.");
+            p.getWorld().setTime(0L);
+            this.main.getPB().clear();
         }
-
     }
 }

src/fr.aymnms.skipnight/EventManager.java

@@ -0,0 +1,24 @@
+package fr.aymnms.skipnight.event;
+
+import fr.aymnms.skipnight.SNMain;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+public class SNLeave implements Listener {
+    private final SNMain main;
+
+    public SNLeave(final SNMain main) {
+        this.main = main;
+    }
+
+    @EventHandler
+    public void onQuit(PlayerQuitEvent e) {
+        Player p = e.getPlayer();
+        SNBed bed = new SNBed(this.main);
+        bed.leaveBed(p);
+        bed.skipNight(p);
+    }
+}

src/fr.aymnms.skipnight/SNMain.java

@@ -1,5 +1,4 @@
 name: SkipNight
-version: 1.0.0
+version: 1.1.0
 author: aymnms
 main: fr.aymnms.skipnight.SNMain
-api-version: 1.17