v1.2.0 (#84)

- allow to throw players
- Throw players #63 - can be done by hitting stacked player - fall damage of a thrown player can be enabled/disabled
- lint repository
- stack mode is now default on
- fix language file (immmune => immune)
- update to 1.20.4

---------

Signed-off-by: Zoey <zoey@z0ey.de>

Author: Zoey2936

.github/.version

@@ -1 +1 @@
-1.1.5
+1.2.0

.github/delete-merged-branch-config.yml

@@ -1,5 +1,5 @@
-exclude: 
+exclude:
   - main
   - stable
   - develop
-delete_closed_pr: true
+delete_closed_pr: true

.github/workflows/build.yml

@@ -19,11 +19,11 @@ jobs:
       - name: Change config.yml if stable
         if: github.ref_name == 'stable' && github.event_name != 'pull_request'
         run: |
-          sed -i "s|updateChannel:.*|updateChannel: \"stable\"|g" src/main/resources/config.yml
+          sed -i "s|updateChannel:.*|updateChannel: stable|g" src/main/resources/config.yml
       - name: Change config.yml if dev
         if: github.ref_name == 'dev' && github.event_name != 'pull_request'
         run: |
-          sed -i "s|updateChannel:.*|updateChannel: \"dev\"|g" src/main/resources/config.yml
+          sed -i "s|updateChannel:.*|updateChannel: dev|g" src/main/resources/config.yml
       - name: Change config.yml if stable/dev
         if: github.ref_name == 'stable' || github.ref_name == 'dev'
         run: |
@@ -60,7 +60,7 @@ jobs:
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           curseforge-id: 507466
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}     
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: Kir-Antipov/mc-publish@v3.3
         if: github.ref_name == 'dev'
         with:

.github/workflows/codeql.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: ["main"]
   schedule:
-    - cron: '21 3 * * 6'
+    - cron: "21 3 * * 6"
 jobs:
   analyze:
     name: Analyze
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['java']
+        language: ["java"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.imgbotconfig

@@ -1,6 +1,6 @@
 {
-    "schedule": "daily",
-    "aggressiveCompression": "true",
-    "compressWiki": "true",
-    "minKBReduced": 0
+  "schedule": "daily",
+  "aggressiveCompression": "true",
+  "compressWiki": "true",
+  "minKBReduced": 0
 }

README.md

@@ -35,16 +35,16 @@ This plugin works with the Minecraft versions 1.11-1.20
 
 This Minecraft versions a currently supported
 
-| Version          | Supported |
-| ---------------- | ----------|
-| => 1.11.2        | ✅        |
-| =  1.11/1.11.1   | ❔        |
-| =< 1.10.2        | ❌        |
+| Version       | Supported |
+| ------------- | --------- |
+| => 1.11.2     | ✅        |
+| = 1.11/1.11.1 | ❔        |
+| =< 1.10.2     | ❌        |
 
 ## Reporting a Bug or suggest a feature
 
 Bugs and feature ideas can be submitted in the issues!
-  
+
 ## Contact us
 
 [Mastodon](https://social.zoeyvid.de/@ZoeyVid) <br/>

languages/cz.yml

@@ -19,4 +19,4 @@ leaveImmuneOther: "%player% již není imunní!"
 joinImmuneOther: "%player% je nyní imunní!"
 leaveImmuneSelf: "Již nejsi imunní!"
 joinImmuneSelf: "Teď jsi imunní!"
-# Petr Šanc 2023
+# Petr Šanc 2023

renovate.json

@@ -1,7 +1,5 @@
 {
-  "extends": [
-    "config:base"
-  ],
+  "extends": ["config:base"],
   "baseBranches": [],
   "includeForks": true,
   "automerge": false,

src/main/java/de/zoeyvid/stacker/Listener/EntityDamageByEntityListener.java

@@ -0,0 +1,23 @@
+package de.zoeyvid.stacker.Listener;
+
+import de.zoeyvid.stacker.loadConfig;
+import de.zoeyvid.stacker.main;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class EntityDamageByEntityListener implements Listener {
+
+  @EventHandler
+  public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+    if (!(event.getDamager() instanceof Player)) return;
+    Player player = (Player) event.getDamager();
+    if (!player.isEmpty() && loadConfig.throwable()) {
+      event.setCancelled(true);
+      Player passenger = (Player) player.getPassengers().get(0);
+      player.eject();
+      main.getVelocity().put(passenger, player.getEyeLocation().getDirection().setY(1));
+    }
+  }
+}

src/main/java/de/zoeyvid/stacker/Listener/EntityDamageListener.java

@@ -0,0 +1,22 @@
+package de.zoeyvid.stacker.Listener;
+
+import de.zoeyvid.stacker.loadConfig;
+import de.zoeyvid.stacker.main;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+public class EntityDamageListener implements Listener {
+
+  @EventHandler
+  public void onEntityDamage(EntityDamageEvent event) {
+    if (loadConfig.throwfalldamage()) return;
+    if (!(event.getEntity() instanceof Player)) return;
+    Player player = (Player) event.getEntity();
+    if (main.getThrown().contains(player) && event.getCause() == DamageCause.FALL) {
+      event.setCancelled(true);
+    }
+  }
+}

src/main/java/de/zoeyvid/stacker/Listener/EntityInteractListener.java

@@ -9,14 +9,14 @@
 
 public class JoinListener implements Listener {
 
-    @EventHandler
-    public void onJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        if (!loadConfig.saveState()) {
-            main.getDisabled().remove(player);
-            main.getStackmode().remove(player);
-        }
-        if (loadConfig.defaultImmune()) main.getDisabled().add(player);
-        if (loadConfig.defaultON()) main.getStackmode().add(player);
+  @EventHandler
+  public void onJoin(PlayerJoinEvent event) {
+    Player player = event.getPlayer();
+    if (!loadConfig.saveState()) {
+      main.getDisabled().remove(player);
+      main.getStackmode().remove(player);
     }
+    if (loadConfig.defaultImmune()) main.getDisabled().add(player);
+    if (loadConfig.defaultON()) main.getStackmode().add(player);
+  }
 }

src/main/java/de/zoeyvid/stacker/Listener/JoinListener.java

@@ -0,0 +1,30 @@
+package de.zoeyvid.stacker.Listener;
+
+import de.zoeyvid.stacker.loadConfig;
+import de.zoeyvid.stacker.loadLanguage;
+import de.zoeyvid.stacker.main;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+public class PlayerInteractListener implements Listener {
+
+  @EventHandler
+  public void onEntityInteract(PlayerInteractEntityEvent event) {
+    Player player = event.getPlayer();
+    if (event.getRightClicked() instanceof Player && main.getStackmode().contains(player)) {
+      Player target = (Player) event.getRightClicked();
+      if (main.getDisabled().contains(target)) {
+        if (loadConfig.showMessage()) {
+          player.sendMessage(main.getPrefix() + ChatColor.WHITE + loadLanguage.dontStack().replace("%player%", target.getName()));
+        }
+      } else {
+        if (player.getWorld().getPlayers().contains(target)) {
+          player.addPassenger(target);
+        }
+      }
+    }
+  }
+}

src/main/java/de/zoeyvid/stacker/Listener/PlayerInteractListener.java

@@ -0,0 +1,28 @@
+package de.zoeyvid.stacker.Listener;
+
+import de.zoeyvid.stacker.main;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+public class PlayerMoveListener implements Listener {
+
+  @EventHandler
+  public void onPlayerMove(PlayerMoveEvent event) {
+    Player player = event.getPlayer();
+    if (main.getVelocity().containsKey(player)) {
+      player.setVelocity(main.getVelocity().get(player));
+      main.getThrown().add(player);
+      main.getVelocity().remove(player);
+    }
+    if (main.getVelocity().containsKey(player) && player.getLocation().getBlock().getRelative(BlockFace.DOWN).getType() != Material.AIR && player.getFallDistance() == 0) {
+      main.getVelocity().remove(player);
+    }
+    if (main.getThrown().contains(player) && player.getLocation().getBlock().getRelative(BlockFace.DOWN).getType() != Material.AIR && player.getFallDistance() == 0) {
+      main.getThrown().remove(player);
+    }
+  }
+}

src/main/java/de/zoeyvid/stacker/Listener/PlayerMoveListener.java

@@ -9,12 +9,12 @@
 
 public class QuitListener implements Listener {
 
-    @EventHandler
-    public void onQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        if (!loadConfig.saveState()) {
-            main.getDisabled().remove(player);
-            main.getStackmode().remove(player);
-        }
+  @EventHandler
+  public void onQuit(PlayerQuitEvent event) {
+    Player player = event.getPlayer();
+    if (!loadConfig.saveState()) {
+      main.getDisabled().remove(player);
+      main.getStackmode().remove(player);
     }
+  }
 }

src/main/java/de/zoeyvid/stacker/Listener/QuitListener.java

@@ -7,12 +7,11 @@
 
 public class ShiftListener implements Listener {
 
-    @EventHandler
-    public void onShift(PlayerToggleSneakEvent event) {
-        Player player = event.getPlayer();
-        if (!player.getPassengers().equals(null)) {
-            player.eject();
-        }
+  @EventHandler
+  public void onShift(PlayerToggleSneakEvent event) {
+    Player player = event.getPlayer();
+    if (!player.isEmpty()) {
+      player.eject();
     }
-
-}
+  }
+}