From 7d2d7f2be7fce4a278b3ea67886343369abed153 Mon Sep 17 00:00:00 2001 From: pintux98 Date: Sat, 11 May 2019 16:32:21 +0200 Subject: [PATCH] Added full 1.13 support for holograms and changed some strings --- MultiArena-TheBridge/.classpath | 21 +++++++++---------- MultiArena-TheBridge/killsounds.yml | 3 --- .../TheBridge/{cosmetics => }/cages/Cage.java | 2 +- .../controllers/WorldController.java | 2 +- .../cosmetics/killsounds/KillSound.java | 9 -------- .../hologram/TruenoHologram_v1_13_R2.java | 3 ++- .../TheBridge/listeners/PlayerListener.java | 2 +- .../sfy/TheBridge/managers/CageManager.java | 2 +- .../TheBridge/managers/KillSoundManager.java | 5 ----- .../src/cx/sfy/TheBridge/menus/GlassMenu.java | 2 +- .../src/cx/sfy/TheBridge/team/Team.java | 2 +- .../src/cx/sfy/TheBridge/team/TeamFour.java | 2 +- 12 files changed, 19 insertions(+), 36 deletions(-) delete mode 100644 MultiArena-TheBridge/killsounds.yml rename MultiArena-TheBridge/src/cx/sfy/TheBridge/{cosmetics => }/cages/Cage.java (95%) delete mode 100644 MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/killsounds/KillSound.java delete mode 100644 MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/KillSoundManager.java diff --git a/MultiArena-TheBridge/.classpath b/MultiArena-TheBridge/.classpath index 2b49d10..b4759d5 100644 --- a/MultiArena-TheBridge/.classpath +++ b/MultiArena-TheBridge/.classpath @@ -2,16 +2,15 @@ - - - - - - - - - - - + + + + + + + + + + diff --git a/MultiArena-TheBridge/killsounds.yml b/MultiArena-TheBridge/killsounds.yml deleted file mode 100644 index c6c13d7..0000000 --- a/MultiArena-TheBridge/killsounds.yml +++ /dev/null @@ -1,3 +0,0 @@ -killsounds: - default: - \ No newline at end of file diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/cages/Cage.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/cages/Cage.java similarity index 95% rename from MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/cages/Cage.java rename to MultiArena-TheBridge/src/cx/sfy/TheBridge/cages/Cage.java index 2fa6d37..a1a93ba 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/cages/Cage.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/cages/Cage.java @@ -1,4 +1,4 @@ -package cx.sfy.TheBridge.cosmetics.cages; +package cx.sfy.TheBridge.cages; import java.io.File; import java.util.ArrayList; diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/controllers/WorldController.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/controllers/WorldController.java index 40dc49e..a74a622 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/controllers/WorldController.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/controllers/WorldController.java @@ -95,7 +95,7 @@ public class WorldController { world.setGameRuleValue("mobGriefing", "false"); world.setGameRuleValue("doFireTick", "false"); world.setGameRuleValue("showDeathMessages", "false"); - world.getBlockAt(0, 75, 0).setType(Material.STONE); + world.getBlockAt(0, 81, 0).setType(Material.STONE); for(final World w : plugin.getServer().getWorlds()) if(w.getName().equals(world.getName())) { loaded = true; diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/killsounds/KillSound.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/killsounds/KillSound.java deleted file mode 100644 index c2307b4..0000000 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/killsounds/KillSound.java +++ /dev/null @@ -1,9 +0,0 @@ -package cx.sfy.TheBridge.cosmetics.killsounds; - -public class KillSound { - - public KillSound() { - - } - -} \ No newline at end of file diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/hologram/TruenoHologram_v1_13_R2.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/hologram/TruenoHologram_v1_13_R2.java index 8e124a8..4d9b984 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/hologram/TruenoHologram_v1_13_R2.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/hologram/TruenoHologram_v1_13_R2.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_13_R2.CraftWorld; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_13_R2.util.CraftChatMessage; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -62,7 +63,7 @@ public class TruenoHologram_v1_13_R2 implements TruenoHologram{ private void NmsSpawn(EntityArmorStand stand, String line, Location loc){ stand.setLocation(loc.getX(), loc.getY(), loc.getZ(), 0, 0); - stand.setCustomName(ChatSerializer.a(line)); + stand.setCustomName(CraftChatMessage.fromStringOrNull(line)); stand.setCustomNameVisible(true); stand.setNoGravity(true); stand.setSmall(true); diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/listeners/PlayerListener.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/listeners/PlayerListener.java index 792ddcb..62ac6ae 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/listeners/PlayerListener.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/listeners/PlayerListener.java @@ -40,7 +40,7 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; import cx.sfy.TheBridge.Main; -import cx.sfy.TheBridge.cosmetics.cages.Cage; +import cx.sfy.TheBridge.cages.Cage; import cx.sfy.TheBridge.database.PlayerStat; import cx.sfy.TheBridge.game.Game; import cx.sfy.TheBridge.game.Game.State; diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/CageManager.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/CageManager.java index 17b4a40..cc91863 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/CageManager.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/CageManager.java @@ -7,7 +7,7 @@ import java.util.List; import org.bukkit.configuration.ConfigurationSection; import cx.sfy.TheBridge.Main; -import cx.sfy.TheBridge.cosmetics.cages.Cage; +import cx.sfy.TheBridge.cages.Cage; public class CageManager { diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/KillSoundManager.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/KillSoundManager.java deleted file mode 100644 index 996415d..0000000 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/KillSoundManager.java +++ /dev/null @@ -1,5 +0,0 @@ -package cx.sfy.TheBridge.managers; - -public class KillSoundManager { - -} diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/menus/GlassMenu.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/menus/GlassMenu.java index 8e04756..aea5240 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/menus/GlassMenu.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/menus/GlassMenu.java @@ -5,7 +5,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import cx.sfy.TheBridge.Main; -import cx.sfy.TheBridge.cosmetics.cages.Cage; +import cx.sfy.TheBridge.cages.Cage; public class GlassMenu { diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/Team.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/Team.java index 33c35a9..92499ec 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/Team.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/Team.java @@ -13,7 +13,7 @@ import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat; import com.sk89q.worldedit.math.transform.Transform; -import cx.sfy.TheBridge.cosmetics.cages.Cage; +import cx.sfy.TheBridge.cages.Cage; import java.io.IOException; import java.util.ArrayList; diff --git a/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/TeamFour.java b/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/TeamFour.java index c4547ab..64032f4 100644 --- a/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/TeamFour.java +++ b/MultiArena-TheBridge/src/cx/sfy/TheBridge/team/TeamFour.java @@ -14,7 +14,7 @@ import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat; import com.sk89q.worldedit.math.transform.Transform; import cx.sfy.TheBridge.Main; -import cx.sfy.TheBridge.cosmetics.cages.Cage; +import cx.sfy.TheBridge.cages.Cage; import cx.sfy.TheBridge.game.GameFour; import cx.sfy.TheBridge.game.GameFour.FState;