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

feat: 1.17 support

Browse source
This commit is contained in:
aro 2022-11-10 10:31:46 +01:00
parent c6fd2ad186
commit 515303b16f
4 changed files with 154 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dist/pom.xml vendored
View file

@ -46,6 +46,11 @@
<artifactId>nicko-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>net.artelnatif</groupId>
<artifactId>nicko-v1_17_R1</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>net.artelnatif</groupId>
<artifactId>nicko-v1_18_R1</artifactId>

3
pom.xml
View file

@ -14,8 +14,9 @@
<module>nicko-core</module>
<module>dist</module>
<module>v1_18_R2</module>
<module>v1_18_R1</module>
<module>net.artelnatif.nicko.impl.v1_17_R1</module>
<module>v1_19_R1</module>
<module>v1_17_R1</module>
</modules>
<properties>

22
v1_17_R1/pom.xml
View file

@ -9,12 +9,20 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>v1_17_R1</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>nicko-v1_17_R1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.artelnatif</groupId>
<artifactId>nicko-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

132
v1_17_R1/src/main/java/net/artelnatif/nicko/impl/v1_17_R1.java Normal file
View file

@ -0,0 +1,132 @@
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.NickoBukkit;
import net.artelnatif.nicko.disguise.NickoProfile;
import net.artelnatif.nicko.disguise.UpdateResult;
import net.artelnatif.nicko.i18n.I18NDict;
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 org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.inventory.ItemStack;
import java.io.IOException;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
public class v1_17_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(),
levelResourceKey, world.getSeed(),
entityPlayer.c.getGamemode(), entityPlayer.d.c(),
false,
false,
false);
final boolean wasFlying = player.isFlying();
final ItemStack itemOnCursor = player.getItemOnCursor();
entityPlayer.b.sendPacket(respawn);
player.setFlying(wasFlying);
player.setItemOnCursor(itemOnCursor);
player.teleport(player.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
player.updateInventory();
}
@Override
public void updateOthers(Player player) {
final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
final PacketPlayOutEntityDestroy destroy = new PacketPlayOutEntityDestroy(entityPlayer.getBukkitEntity().getEntityId());
final PacketPlayOutNamedEntitySpawn spawn = new PacketPlayOutNamedEntitySpawn(entityPlayer);
/*
BIT MASKS:
0x01 Cape enabled
0x02 Jacket enabled
0x04 Left sleeve enabled
0x08 Right sleeve enabled
0x10 Left pants leg enabled
0x20 Right pants leg enabled
0x40 Hat enabled
*/
final DataWatcher dataWatcher = entityPlayer.getDataWatcher();
final DataWatcherObject<Byte> displayedSkinPartDataWatcher = new DataWatcherObject<>(17, DataWatcherRegistry.a);
dataWatcher.set(displayedSkinPartDataWatcher, (byte) 0x7f); // 127, all masks combined
final PacketPlayOutEntityMetadata entityMetadata = new PacketPlayOutEntityMetadata(entityPlayer.getBukkitEntity().getEntityId(), dataWatcher, true);
Bukkit.getOnlinePlayers().forEach(online -> {
EntityPlayer onlineEntityPlayer = ((CraftPlayer) online).getHandle();
if (onlineEntityPlayer.getBukkitEntity().getUniqueId() != player.getUniqueId()) {
onlineEntityPlayer.b.sendPacket(destroy);
onlineEntityPlayer.b.sendPacket(spawn);
onlineEntityPlayer.b.sendPacket(entityMetadata);
}
});
}
@Override
public UpdateResult updateProfile(Player player, NickoProfile profile, boolean skinChange) {
final CraftPlayer craftPlayer = (CraftPlayer) player;
final EntityPlayer entityPlayer = craftPlayer.getHandle();
Optional<MojangSkin> skin;
final PacketPlayOutPlayerInfo remove = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.e, entityPlayer);
entityPlayer.b.sendPacket(remove);
final PacketPlayOutPlayerInfo add = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.a);
final GameProfile gameProfile = new GameProfile(player.getUniqueId(), profile.getName());
if (skinChange) {
try {
final Optional<String> uuid = NickoBukkit.getInstance().getMojangAPI().getUUID(profile.getSkin());
if (uuid.isPresent()) {
skin = NickoBukkit.getInstance().getMojangAPI().getSkin(uuid.get());
if (skin.isPresent()) {
final PropertyMap properties = gameProfile.getProperties();
properties.put("textures", new Property("textures", skin.get().value(), skin.get().signature()));
updateSelf(player);
} else {
return new UpdateResult(I18NDict.Error.SKIN_FAIL_MOJANG);
}
} else {
return new UpdateResult(I18NDict.Error.NAME_FAIL_MOJANG);
}
} catch (ExecutionException e) {
return new UpdateResult(I18NDict.Error.SKIN_FAIL_CACHE);
} catch (IOException e) {
return new UpdateResult(I18NDict.Error.UNEXPECTED_ERROR);
}
}
add.b().clear();
add.b().add(new PacketPlayOutPlayerInfo.PlayerInfoData(gameProfile,
player.getPing(),
EnumGamemode.getById(player.getGameMode().ordinal()), IChatBaseComponent.a(profile.getName())));
entityPlayer.b.sendPacket(add);
Bukkit.getOnlinePlayers().forEach(online -> {
EntityPlayer onlineEntityPlayer = ((CraftPlayer) online).getHandle();
onlineEntityPlayer.b.sendPacket(remove);
onlineEntityPlayer.b.sendPacket(add);
});
updateOthers(player);
return new UpdateResult();
}
}