ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

feat: 1.13 - 1.16.5 support

Browse source
This commit is contained in:
aro 2023-01-31 16:40:55 +01:00
parent acef7e2f55
commit dae78564c1
14 changed files with 527 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

2
v1_16_R1/pom.xml
View file

@ -16,7 +16,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<version>1.16.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

61
v1_16_R1/src/main/java/net/artelnatif/nicko/impl/v1_17_R1.java → v1_16_R1/src/main/java/net/artelnatif/nicko/impl/v1_16_R1.java
View file

@ -3,39 +3,35 @@ package net.artelnatif.nicko.impl;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
import net.artelnatif.nicko.bukkit.NickoBukkit;
import net.artelnatif.nicko.disguise.ActionResult;
import net.artelnatif.nicko.disguise.NickoProfile;
import net.artelnatif.nicko.mojang.MojangSkin;
import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.network.protocol.game.*;
import net.minecraft.network.syncher.DataWatcher;
import net.minecraft.network.syncher.DataWatcherObject;
import net.minecraft.network.syncher.DataWatcherRegistry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.EntityPlayer;
import net.minecraft.world.level.EnumGamemode;
import net.minecraft.world.level.World;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
import net.minecraft.server.v1_16_R1.*;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent;
public class v1_17_R1 implements Internals {
import java.lang.reflect.Field;
import java.util.ArrayList;
public class v1_16_R1 implements Internals {
@Override
public void updateSelf(Player player) {
final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
final ResourceKey<World> levelResourceKey = entityPlayer.getWorld().getDimensionKey();
final CraftWorld world = entityPlayer.getWorld().getWorld();
final PacketPlayOutRespawn respawn = new PacketPlayOutRespawn(entityPlayer.getWorld().getDimensionManager(),
final PacketPlayOutRespawn respawn = new PacketPlayOutRespawn(entityPlayer.getWorld().getTypeKey(),
levelResourceKey, world.getSeed(),
entityPlayer.c.getGamemode(), entityPlayer.d.c(),
entityPlayer.playerInteractManager.c(), entityPlayer.playerInteractManager.getGameMode(),
false,
false,
false);
final boolean wasFlying = player.isFlying();
entityPlayer.b.sendPacket(respawn);
entityPlayer.playerConnection.sendPacket(respawn);
player.setFlying(wasFlying);
player.teleport(player.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
player.updateInventory();
@ -55,10 +51,10 @@ public class v1_17_R1 implements Internals {
Bukkit.getOnlinePlayers().forEach(online -> {
EntityPlayer onlineEntityPlayer = ((CraftPlayer) online).getHandle();
if (onlineEntityPlayer.getBukkitEntity().getUniqueId() != player.getUniqueId()) {
onlineEntityPlayer.b.sendPacket(destroy);
onlineEntityPlayer.b.sendPacket(spawn);
onlineEntityPlayer.playerConnection.sendPacket(destroy);
onlineEntityPlayer.playerConnection.sendPacket(spawn);
}
onlineEntityPlayer.b.sendPacket(entityMetadata);
onlineEntityPlayer.playerConnection.sendPacket(entityMetadata);
});
}
@ -82,20 +78,33 @@ public class v1_17_R1 implements Internals {
}
}
final PacketPlayOutPlayerInfo remove = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.e, entityPlayer);
final PacketPlayOutPlayerInfo add = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.a);
final PacketPlayOutPlayerInfo remove = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entityPlayer);
final PacketPlayOutPlayerInfo add = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER);
final IChatBaseComponent name = new ChatComponentText(profileName);
add.b().clear();
add.b().add(new PacketPlayOutPlayerInfo.PlayerInfoData(gameProfile,
player.getPing(),
EnumGamemode.getById(player.getGameMode().ordinal()), IChatBaseComponent.a(profileName)));
final PacketPlayOutPlayerInfo.PlayerInfoData data = remove.new PlayerInfoData(gameProfile,
entityPlayer.ping,
EnumGamemode.getById(player.getGameMode().ordinal()), name);
final ArrayList<PacketPlayOutPlayerInfo.PlayerInfoData> list = new ArrayList<>();
list.add(data);
spoofPlayerInfoPacket(add, list);
Bukkit.getOnlinePlayers().forEach(online -> {
EntityPlayer onlineEntityPlayer = ((CraftPlayer) online).getHandle();
onlineEntityPlayer.b.sendPacket(remove);
onlineEntityPlayer.b.sendPacket(add);
onlineEntityPlayer.playerConnection.sendPacket(remove);
onlineEntityPlayer.playerConnection.sendPacket(add);
});
updateOthers(player);
return new ActionResult<>();
}
private void spoofPlayerInfoPacket(Object object, Object newValue) {
try {
final Field field = object.getClass().getDeclaredField("b");
field.setAccessible(true);
field.set(object, newValue);
} catch (NoSuchFieldException | IllegalAccessException e) {
NickoBukkit.getInstance().getLogger().warning("Unable to spoof packet, that's bad! (" + e.getMessage() + ")");
}
}
}