EntryRise
/
TheBridge
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added full 1.13 support for holograms and changed some strings

master
pintux98 6 years ago
parent
28dd8a990a
commit
7d2d7f2be7
12 changed files with 19 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      MultiArena-TheBridge/.classpath
  2. 3
      MultiArena-TheBridge/killsounds.yml
  3. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/cages/Cage.java
  4. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/controllers/WorldController.java
  5. 9
      MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/killsounds/KillSound.java
  6. 3
      MultiArena-TheBridge/src/cx/sfy/TheBridge/hologram/TruenoHologram_v1_13_R2.java
  7. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/listeners/PlayerListener.java
  8. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/CageManager.java
  9. 5
      MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/KillSoundManager.java
  10. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/menus/GlassMenu.java
  11. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/team/Team.java
  12. 2
      MultiArena-TheBridge/src/cx/sfy/TheBridge/team/TeamFour.java

21
MultiArena-TheBridge/.classpath
View File

@ -2,16 +2,15 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/FastAsyncWorldEdit-bukkit-19.04.22-57c85d0-1271-22.0.6.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/LeaderHeads.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/PlaceholderAPI-2.9.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/spigot-1.9.4-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/spigot-1.8.8-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/worldedit-bukkit-6.1.9.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/paperspigot-api-1.8.8-R0.1-20160806.221350-1.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/spigot-1.10.2-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/spigot-1.11.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/spigot-1.12.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/SpigotJars/spigot-1.13.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/FastAsyncWorldEdit-bukkit-19.04.22-57c85d0-1271-22.0.6.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/LeaderHeads.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/PlaceholderAPI-2.9.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/spigot-1.9.4-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/spigot-1.8.8-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/spigot-1.10.2-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/spigot-1.11.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/spigot-1.12.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/spigot-1.13.2.jar"/>
<classpathentry kind="lib" path="C:/Users/pintu/Desktop/pindev/spigot-related/worldedit-bukkit-6.1.9.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

3
MultiArena-TheBridge/killsounds.yml
View File

@ -1,3 +0,0 @@
killsounds:
default:

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/cages/Cage.java → MultiArena-TheBridge/src/cx/sfy/TheBridge/cages/Cage.java
View File

@ -1,4 +1,4 @@
package cx.sfy.TheBridge.cosmetics.cages;
package cx.sfy.TheBridge.cages;
import java.io.File;
import java.util.ArrayList;

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/controllers/WorldController.java
View File

@ -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;

9
MultiArena-TheBridge/src/cx/sfy/TheBridge/cosmetics/killsounds/KillSound.java
View File

@ -1,9 +0,0 @@
package cx.sfy.TheBridge.cosmetics.killsounds;
public class KillSound {
public KillSound() {
}
}

3
MultiArena-TheBridge/src/cx/sfy/TheBridge/hologram/TruenoHologram_v1_13_R2.java
View File

@ -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);

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/listeners/PlayerListener.java
View File

@ -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;

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/CageManager.java
View File

@ -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 {

5
MultiArena-TheBridge/src/cx/sfy/TheBridge/managers/KillSoundManager.java
View File

@ -1,5 +0,0 @@
package cx.sfy.TheBridge.managers;
public class KillSoundManager {
}

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/menus/GlassMenu.java
View File

@ -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 {

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/team/Team.java
View File

@ -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;

2
MultiArena-TheBridge/src/cx/sfy/TheBridge/team/TeamFour.java
View File

@ -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;

Write Preview
Loading…
Cancel
Save