From c463823c059a9239989c9842aeabcb9119d3f5a5 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Tue, 14 Jan 2020 22:16:12 +0100 Subject: [PATCH] implemented version independence --- .../steamwar/fightsystem/fight/Fight_10.java | 18 ++++++ .../steamwar/fightsystem/fight/Fight_12.java | 19 +++++++ .../steamwar/fightsystem/fight/Fight_14.java | 18 ++++++ .../steamwar/fightsystem/fight/Fight_15.java | 18 ++++++ .../steamwar/fightsystem/fight/Fight_8.java | 18 ++++++ .../steamwar/fightsystem/fight/Fight_9.java | 18 ++++++ .../de/steamwar/fightsystem/fight/Fight.java | 57 +++++++++++++++++-- 7 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java create mode 100644 FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java create mode 100644 FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java create mode 100644 FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java create mode 100644 FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java create mode 100644 FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java diff --git a/FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java b/FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java new file mode 100644 index 0000000..32f331f --- /dev/null +++ b/FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java @@ -0,0 +1,18 @@ +package de.steamwar.fightsystem.fight; + +import org.bukkit.entity.Player; + +public class Fight_10 { + + private Fight_10() {} + + static void hidePlayer(Player target, Player toHide) { + Fight_8.hidePlayer(target, toHide); + } + + static void showPlayer(Player target, Player toShow) { + Fight_8.showPlayer(target, toShow); + } + + +} diff --git a/FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java b/FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java new file mode 100644 index 0000000..1228d4e --- /dev/null +++ b/FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java @@ -0,0 +1,19 @@ +package de.steamwar.fightsystem.fight; + +import de.steamwar.fightsystem.IFightSystem; +import org.bukkit.entity.Player; + +public class Fight_12 { + + private Fight_12() {} + + static void hidePlayer(Player target, Player toHide) { + target.hidePlayer(IFightSystem.getPlugin(), toHide); + } + + static void showPlayer(Player target, Player toShow) { + target.showPlayer(IFightSystem.getPlugin(), toShow); + } + + +} diff --git a/FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java b/FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java new file mode 100644 index 0000000..48e3c57 --- /dev/null +++ b/FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java @@ -0,0 +1,18 @@ +package de.steamwar.fightsystem.fight; + +import org.bukkit.entity.Player; + +public class Fight_14 { + + private Fight_14() {} + + static void hidePlayer(Player target, Player toHide) { + Fight_12.hidePlayer(target, toHide); + } + + static void showPlayer(Player target, Player toShow) { + Fight_12.showPlayer(target, toShow); + } + + +} diff --git a/FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java b/FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java new file mode 100644 index 0000000..486e873 --- /dev/null +++ b/FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java @@ -0,0 +1,18 @@ +package de.steamwar.fightsystem.fight; + +import org.bukkit.entity.Player; + +public class Fight_15 { + + private Fight_15() {} + + static void hidePlayer(Player target, Player toHide) { + Fight_14.hidePlayer(target, toHide); + } + + static void showPlayer(Player target, Player toShow) { + Fight_14.showPlayer(target, toShow); + } + + +} diff --git a/FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java b/FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java new file mode 100644 index 0000000..e006501 --- /dev/null +++ b/FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java @@ -0,0 +1,18 @@ +package de.steamwar.fightsystem.fight; + +import org.bukkit.entity.Player; + +public class Fight_8 { + + private Fight_8() {} + + static void hidePlayer(Player target, Player toHide) { + target.hidePlayer(toHide); + } + + static void showPlayer(Player target, Player toShow) { + target.showPlayer(toShow); + } + + +} diff --git a/FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java b/FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java new file mode 100644 index 0000000..51dda59 --- /dev/null +++ b/FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java @@ -0,0 +1,18 @@ +package de.steamwar.fightsystem.fight; + +import org.bukkit.entity.Player; + +public class Fight_9 { + + private Fight_9() {} + + static void hidePlayer(Player target, Player toHide) { + Fight_8.hidePlayer(target, toHide); + } + + static void showPlayer(Player target, Player toShow) { + Fight_8.showPlayer(target, toShow); + } + + +} diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java index 6470089..488405c 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java @@ -1,5 +1,6 @@ package de.steamwar.fightsystem.fight; +import de.steamwar.core.Core; import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.FightSystem; import org.bukkit.Bukkit; @@ -92,8 +93,32 @@ public class Fight { if(gameMode == GameMode.SPECTATOR) { for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) { if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() == GameMode.SPECTATOR) { - currentPlayer.hidePlayer(FightSystem.getPlugin(), player); - player.hidePlayer(FightSystem.getPlugin(), currentPlayer); + switch (Core.getVersion()) { + case 8: + Fight_8.hidePlayer(currentPlayer, player); + Fight_8.hidePlayer(player, currentPlayer); + break; + case 9: + Fight_9.hidePlayer(currentPlayer, player); + Fight_9.hidePlayer(player, currentPlayer); + break; + case 10: + Fight_10.hidePlayer(currentPlayer, player); + Fight_10.hidePlayer(player, currentPlayer); + break; + case 14: + Fight_14.hidePlayer(currentPlayer, player); + Fight_14.hidePlayer(player, currentPlayer); + break; + case 15: + Fight_15.hidePlayer(currentPlayer, player); + Fight_15.hidePlayer(player, currentPlayer); + break; + default: + Fight_12.hidePlayer(currentPlayer, player); + Fight_12.hidePlayer(player, currentPlayer); + break; + } } } } @@ -101,8 +126,32 @@ public class Fight { if(gameMode == GameMode.SURVIVAL) { for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) { if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() == GameMode.SPECTATOR) { - currentPlayer.showPlayer(FightSystem.getPlugin(), player); - player.showPlayer(FightSystem.getPlugin(), currentPlayer); + switch (Core.getVersion()) { + case 8: + Fight_8.showPlayer(currentPlayer, player); + Fight_8.showPlayer(player, currentPlayer); + break; + case 9: + Fight_9.showPlayer(currentPlayer, player); + Fight_9.showPlayer(player, currentPlayer); + break; + case 10: + Fight_10.showPlayer(currentPlayer, player); + Fight_10.showPlayer(player, currentPlayer); + break; + case 14: + Fight_14.showPlayer(currentPlayer, player); + Fight_14.showPlayer(player, currentPlayer); + break; + case 15: + Fight_15.showPlayer(currentPlayer, player); + Fight_15.showPlayer(player, currentPlayer); + break; + default: + Fight_12.showPlayer(currentPlayer, player); + Fight_12.showPlayer(player, currentPlayer); + break; + } } } }