GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Some additional merge changes

Browse source
This commit is contained in:
Tim203 2023-05-05 18:22:31 +02:00
parent 6ca53f5bf3
commit d14a20845d
No known key found for this signature in database
GPG key ID: 736F3CD49EF01DBF
28 changed files with 82 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bootstrap/spigot/build.gradle.kts
View file

@ -9,20 +9,11 @@ dependencies {
implementation(libs.commodore)
implementation(libs.adventure.text.serializer.bungeecord)
// Both folia-api and paper-mojangapi only provide Java 17 versions for 1.19
compileOnly(libs.folia.api) {
attributes {
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
}
}
compileOnly(libs.paper.mojangapi) {
attributes {
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
}
}
implementation("org.geysermc.floodgate", "spigot", "2.2.0-SNAPSHOT")
compileOnly(libs.folia.api)
compileOnly(libs.paper.mojangapi)
implementation(libs.floodgate.spigot)
}
platformRelocate("it.unimi.dsi.fastutil")

7
bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
View file

@ -42,9 +42,7 @@ import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import org.geysermc.floodgate.pluginmessage.SpigotSkinApplier;
import org.geysermc.floodgate.skin.SkinApplier;
import org.geysermc.floodgate.util.SpigotVersionSpecificMethods;
import org.geysermc.floodgate.core.skin.SkinApplier;
import org.geysermc.geyser.Constants;
import org.geysermc.geyser.GeyserBootstrap;
import org.geysermc.geyser.GeyserImpl;
@ -431,7 +429,8 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
@Override
public SkinApplier createSkinApplier() {
return new SpigotSkinApplier(new SpigotVersionSpecificMethods(this), this);
// return new SpigotSkinApplier(new SpigotVersionSpecificMethods(this), this);
return null;
}
/**

4
bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/SpigotHybridChannelHandler.java
View file

@ -29,13 +29,13 @@ import com.mojang.authlib.GameProfile;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.geysermc.floodgate.util.ClassNames;
import org.geysermc.floodgate.spigot.util.ClassNames;
import org.geysermc.geyser.hybrid.IntegratedHybridProvider;
import org.geysermc.geyser.session.GeyserSession;
import javax.annotation.Nonnull;
import static org.geysermc.floodgate.util.ReflectionUtils.setValue;
import static org.geysermc.floodgate.core.util.ReflectionUtils.setValue;
@ChannelHandler.Sharable
public final class SpigotHybridChannelHandler extends ChannelInboundHandlerAdapter {