From bb2e8d0fdf5a34b4e8c2956539e6ec282909fd4c Mon Sep 17 00:00:00 2001 From: zimzaza4 <3625282098@qq.com> Date: Sun, 31 Mar 2024 19:08:23 +0800 Subject: [PATCH] errr --- .../geyserutils/geyser/GeyserUtils.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java index a892198..84b7f3c 100644 --- a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java +++ b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java @@ -1,7 +1,9 @@ package me.zimzaza4.geyserutils.geyser; +import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType; import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket; import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket; +import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddEntityPacket; import com.github.steveice10.packetlib.Session; import com.github.steveice10.packetlib.event.session.SessionAdapter; import com.github.steveice10.packetlib.packet.Packet; @@ -76,8 +78,17 @@ public class GeyserUtils implements Extension { } for (File file : folder.listFiles()) { if (file.isDirectory()) { - File textureFile = new File(file, "texture.png"); - File geometryFile = new File(file, "geometry.json"); + File textureFile = null; + File geometryFile = null; + + for (File folderFile : file.listFiles()) { + if (folderFile.getName().endsWith(".png")) { + textureFile = folderFile; + } + if (folderFile.getName().endsWith(".json")) { + geometryFile = folderFile; + } + } try { SkinProvider.Skin skin = new SkinProvider.Skin(null, file.getName(), Files.readAllBytes(textureFile.toPath()), -1, false, false); @@ -200,6 +211,7 @@ public class GeyserUtils implements Extension { } } } + } } } @@ -255,6 +267,7 @@ public class GeyserUtils implements Extension { entry.setPlatformChatId(""); entry.setTeacher(false); entry.setTrustedSkin(true); + return entry; }