Upstream
/
SongodaCore
mirror of https://github.com/songoda/SongodaCore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removes depenency on NMSPlayerImpl for NmsWorldBorderImpl

This commit is contained in:
Christian Koop 2022-08-28 16:52:54 +02:00
parent e96cb5426d
commit e18db1d775
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
20 changed files with 57 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Core/src/main/java/com/songoda/core/nms/NmsManager.java
View File

@ -26,133 +26,133 @@ public class NmsManager {
anvil = new com.songoda.core.nms.v1_8_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_8_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_8_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_8_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_8_R1.world.NmsWorldBorderImpl();
break;
case "v1_8_R2":
player = new com.songoda.core.nms.v1_8_R2.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_8_R2.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_8_R2.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_8_R2.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_8_R2.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_8_R2.world.NmsWorldBorderImpl();
break;
case "v1_8_R3":
player = new com.songoda.core.nms.v1_8_R3.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_8_R3.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_8_R3.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_8_R3.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_8_R3.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_8_R3.world.NmsWorldBorderImpl();
break;
case "v1_9_R1":
player = new com.songoda.core.nms.v1_9_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_9_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_9_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_9_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_9_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_9_R1.world.NmsWorldBorderImpl();
break;
case "v1_9_R2":
player = new com.songoda.core.nms.v1_9_R2.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_9_R2.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_9_R2.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_9_R2.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_9_R2.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_9_R2.world.NmsWorldBorderImpl();
break;
case "v1_10_R1":
player = new com.songoda.core.nms.v1_10_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_10_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_10_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_10_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_10_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_10_R1.world.NmsWorldBorderImpl();
break;
case "v1_11_R1":
player = new com.songoda.core.nms.v1_11_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_11_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_11_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_11_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_11_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_11_R1.world.NmsWorldBorderImpl();
break;
case "v1_12_R1":
player = new com.songoda.core.nms.v1_12_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_12_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_12_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_12_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_12_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_12_R1.world.NmsWorldBorderImpl();
break;
case "v1_13_R1":
player = new com.songoda.core.nms.v1_13_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_13_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_13_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_13_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_13_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_13_R1.world.NmsWorldBorderImpl();
break;
case "v1_13_R2":
player = new com.songoda.core.nms.v1_13_R2.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_13_R2.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_13_R2.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_13_R2.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_13_R2.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_13_R2.world.NmsWorldBorderImpl();
break;
case "v1_14_R1":
player = new com.songoda.core.nms.v1_14_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_14_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_14_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_14_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_14_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_14_R1.world.NmsWorldBorderImpl();
break;
case "v1_15_R1":
player = new com.songoda.core.nms.v1_15_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_15_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_15_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_15_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_15_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_15_R1.world.NmsWorldBorderImpl();
break;
case "v1_16_R1":
player = new com.songoda.core.nms.v1_16_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_16_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_16_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_16_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_16_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_16_R1.world.NmsWorldBorderImpl();
break;
case "v1_16_R2":
player = new com.songoda.core.nms.v1_16_R2.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_16_R2.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_16_R2.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_16_R2.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_16_R2.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_16_R2.world.NmsWorldBorderImpl();
break;
case "v1_16_R3":
player = new com.songoda.core.nms.v1_16_R3.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_16_R3.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_16_R3.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_16_R3.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_16_R3.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_16_R3.world.NmsWorldBorderImpl();
break;
case "v1_17_R1":
player = new com.songoda.core.nms.v1_17_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_17_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_17_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_17_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_17_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_17_R1.world.NmsWorldBorderImpl();
break;
case "v1_18_R1":
player = new com.songoda.core.nms.v1_18_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_18_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_18_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_18_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_18_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_18_R1.world.NmsWorldBorderImpl();
break;
case "v1_18_R2":
player = new com.songoda.core.nms.v1_18_R2.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_18_R2.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_18_R2.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_18_R2.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_18_R2.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_18_R2.world.NmsWorldBorderImpl();
break;
case "v1_19_R1":
player = new com.songoda.core.nms.v1_19_R1.entity.NMSPlayerImpl();
anvil = new com.songoda.core.nms.v1_19_R1.anvil.AnvilCore();
nbt = new com.songoda.core.nms.v1_19_R1.nbt.NBTCoreImpl();
world = new com.songoda.core.nms.v1_19_R1.world.WorldCoreImpl();
worldBorder = new com.songoda.core.nms.v1_19_R1.world.NmsWorldBorderImpl(player);
worldBorder = new com.songoda.core.nms.v1_19_R1.world.NmsWorldBorderImpl();
break;
default:
Logger.getLogger(NmsManager.class.getName()).log(Level.SEVERE, "Failed to load NMS for this server version: version {0} not found", serverPackageVersion);

10
NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_10_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_10_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_10_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_11_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_11_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_11_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_12_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_12_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_12_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_13_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_13_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_13_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_13_R2.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_13_R2.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_13_R2.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_14_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_14_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_14_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_15_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_15_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_15_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_16_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_16_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_16_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_16_R2.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_16_R2.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_16_R2.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_16_R3.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_16_R3.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_16_R3.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

9
NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/NmsWorldBorderImpl.java
View File

@ -6,18 +6,13 @@ import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
import net.minecraft.world.level.border.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +31,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new ClientboundInitializeBorderPacket(worldBorder));
((CraftPlayer) player).getHandle().b.sendPacket(new ClientboundInitializeBorderPacket(worldBorder));
}
}

10
NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_18_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
import net.minecraft.world.level.border.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.lerpSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new ClientboundInitializeBorderPacket(worldBorder));
((CraftPlayer) player).getHandle().connection.send(new ClientboundInitializeBorderPacket(worldBorder));
}
}

10
NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_18_R2.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
import net.minecraft.world.level.border.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.lerpSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new ClientboundInitializeBorderPacket(worldBorder));
((CraftPlayer) player).getHandle().connection.send(new ClientboundInitializeBorderPacket(worldBorder));
}
}

10
NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_19_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
import net.minecraft.world.level.border.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.lerpSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new ClientboundInitializeBorderPacket(worldBorder));
((CraftPlayer) player).getHandle().connection.send(new ClientboundInitializeBorderPacket(worldBorder));
}
}

10
NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_8_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_8_R1.EnumWorldBorderAction;
import net.minecraft.server.v1_8_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_8_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -34,6 +28,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.a(size, size - 1.0D, Long.MAX_VALUE); // transitionSizeBetween
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/NmsWorldBorderImpl.java
View File

@ -1,22 +1,16 @@
package com.songoda.core.nms.v1_8_R2.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_8_R2.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_8_R2.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -33,6 +27,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/NmsWorldBorderImpl.java
View File

@ -1,22 +1,16 @@
package com.songoda.core.nms.v1_8_R3.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_8_R3.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_8_R3.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -33,6 +27,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_9_R1.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_9_R1.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_9_R1.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}

10
NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/NmsWorldBorderImpl.java
View File

@ -1,23 +1,17 @@
package com.songoda.core.nms.v1_9_R2.world;
import com.songoda.core.nms.entity.NMSPlayer;
import com.songoda.core.nms.world.NmsWorldBorder;
import net.minecraft.server.v1_9_R2.PacketPlayOutWorldBorder;
import net.minecraft.server.v1_9_R2.WorldBorder;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class NmsWorldBorderImpl implements NmsWorldBorder {
private final NMSPlayer nmsPlayer;
public NmsWorldBorderImpl(NMSPlayer nmsPlayer) {
this.nmsPlayer = nmsPlayer;
}
@Override
public void send(Player player, BorderColor color, double size, @NotNull Location center) {
Objects.requireNonNull(center.getWorld());
@ -36,6 +30,6 @@ public class NmsWorldBorderImpl implements NmsWorldBorder {
worldBorder.transitionSizeBetween(size, size - 1.0D, Long.MAX_VALUE);
}
this.nmsPlayer.sendPacket(player, new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldBorder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
}
}