diff --git a/geyser/libs/Geyser-Standalone.jar b/geyser/libs/Geyser-Standalone.jar index c572189..fc031fb 100644 Binary files a/geyser/libs/Geyser-Standalone.jar and b/geyser/libs/Geyser-Standalone.jar differ diff --git a/geyser/pom.xml b/geyser/pom.xml index 3d8a5d0..1ebb7b4 100644 --- a/geyser/pom.xml +++ b/geyser/pom.xml @@ -79,7 +79,7 @@ org.geysermc.geyser core - 2.3.0-SNAPSHOT + 2.4.4-SNAPSHOT system ${project.basedir}/libs/Geyser-Standalone.jar 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 668705b..9e31eaa 100644 --- a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java +++ b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java @@ -339,7 +339,7 @@ public class GeyserUtils implements Extension { String particle = map.get(id); if (particle != null) { - int dimensionId = DimensionUtils.javaToBedrock(session.getDimension()); + int dimensionId = DimensionUtils.javaToBedrock(session); SpawnParticleEffectPacket stringPacket = new SpawnParticleEffectPacket(); stringPacket.setIdentifier(particle); @@ -463,7 +463,7 @@ public class GeyserUtils implements Extension { } else if (customPacket instanceof CustomParticleEffectPayloadPacket customParticleEffectPacket) { SpawnParticleEffectPacket spawnParticleEffectPacket = new SpawnParticleEffectPacket(); - spawnParticleEffectPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension())); + spawnParticleEffectPacket.setDimensionId(DimensionUtils.javaToBedrock(session)); spawnParticleEffectPacket.setPosition(Converter.serializePos(customParticleEffectPacket.getPos())); spawnParticleEffectPacket.setIdentifier(customParticleEffectPacket.getParticle().identifier()); spawnParticleEffectPacket.setMolangVariablesJson(Optional.ofNullable(customParticleEffectPacket.getParticle().molangVariablesJson())); diff --git a/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/GeyserUtils.java b/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/GeyserUtils.java index 56ade78..cfa3ada 100644 --- a/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/GeyserUtils.java +++ b/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/GeyserUtils.java @@ -4,15 +4,12 @@ import lombok.Getter; import me.zimzaza4.geyserutils.common.camera.data.CameraPreset; import me.zimzaza4.geyserutils.common.channel.GeyserUtilsChannels; import me.zimzaza4.geyserutils.common.manager.PacketManager; -import me.zimzaza4.geyserutils.common.packet.NpcFormResponseCustomPayloadPacket; import me.zimzaza4.geyserutils.common.packet.CustomPayloadPacket; -import me.zimzaza4.geyserutils.common.util.CustomPayloadPacketUtils; +import me.zimzaza4.geyserutils.common.packet.NpcFormResponseCustomPayloadPacket; import me.zimzaza4.geyserutils.spigot.api.form.NpcDialogueForm; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.messaging.Messenger; -import java.util.function.BiConsumer; - public final class GeyserUtils extends JavaPlugin { @Getter