mirror of https://github.com/GeyserMC/Geyser.git
Compare commits
12 Commits
54945c287c
...
50885d4a92
Author | SHA1 | Date |
---|---|---|
Blue Tree | 50885d4a92 | |
AJ Ferguson | 8addcadb71 | |
Camotoy | 5770c96f48 | |
BlueTree242 | a1a2959f03 | |
BlueTree242 | 96d99c3093 | |
BlueTree242 | 5d673b6edd | |
BlueTree242 | 1e18d51d18 | |
Blue Tree | 987c440fae | |
Blue Tree | cf8d318409 | |
Blue Tree | fe858d87c7 | |
BlueTree242 | 7edda9f3da | |
BlueTree242 | bdb1aed40c |
|
@ -14,7 +14,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
|
|||
|
||||
Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
|
||||
|
||||
### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.80 and Minecraft Java 1.20.5/1.20.6
|
||||
### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.80/81 and Minecraft Java 1.20.5/1.20.6
|
||||
|
||||
## Setting Up
|
||||
Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.
|
||||
|
|
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
* @author GeyserMC
|
||||
* @link https://github.com/GeyserMC/Geyser
|
||||
*/
|
||||
|
||||
package org.geysermc.geyser.api.event.java;
|
||||
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.geysermc.geyser.api.connection.GeyserConnection;
|
||||
import org.geysermc.geyser.api.event.connection.ConnectionEvent;
|
||||
|
||||
/**
|
||||
* Called when the Java server sends a custom payload to Geyser.
|
||||
* This event is not called when a built-in custom payload
|
||||
* such as Floodgate is received.
|
||||
*/
|
||||
public class ServerCustomPayloadEvent extends ConnectionEvent {
|
||||
|
||||
private final String channel;
|
||||
private final byte[] data;
|
||||
|
||||
public ServerCustomPayloadEvent(@NonNull GeyserConnection connection, @NonNull String channel, byte[] data) {
|
||||
super(connection);
|
||||
this.channel = channel;
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
/**
|
||||
* The channel that sent this custom payload.
|
||||
* A channel would look something like this:
|
||||
* <code>minecraft:register</code>.
|
||||
* @return the channel that sent this custom payload.
|
||||
*/
|
||||
public @NonNull String channel() {
|
||||
return channel;
|
||||
}
|
||||
|
||||
/**
|
||||
* The data field of the custom payload.
|
||||
* @return the data field of the custom payload.
|
||||
*/
|
||||
public byte[] data() {
|
||||
return data;
|
||||
}
|
||||
}
|
|
@ -50,7 +50,9 @@ public final class GameProtocol {
|
|||
* Default Bedrock codec that should act as a fallback. Should represent the latest available
|
||||
* release of the game that Geyser supports.
|
||||
*/
|
||||
public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v671.CODEC);
|
||||
public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v671.CODEC.toBuilder()
|
||||
.minecraftVersion("1.20.81")
|
||||
.build());
|
||||
|
||||
/**
|
||||
* A list of all supported Bedrock versions that can join Geyser
|
||||
|
@ -77,7 +79,7 @@ public final class GameProtocol {
|
|||
.minecraftVersion("1.20.70/1.20.73")
|
||||
.build()));
|
||||
SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(DEFAULT_BEDROCK_CODEC.toBuilder()
|
||||
.minecraftVersion("1.20.80")
|
||||
.minecraftVersion("1.20.80/1.20.81")
|
||||
.build()));
|
||||
}
|
||||
|
||||
|
|
|
@ -40,6 +40,8 @@ import org.geysermc.erosion.packet.geyserbound.GeyserboundPacket;
|
|||
import org.geysermc.floodgate.pluginmessage.PluginMessageChannels;
|
||||
import org.geysermc.geyser.GeyserImpl;
|
||||
import org.geysermc.geyser.GeyserLogger;
|
||||
import org.geysermc.geyser.api.event.EventBus;
|
||||
import org.geysermc.geyser.api.event.java.ServerCustomPayloadEvent;
|
||||
import org.geysermc.geyser.session.GeyserSession;
|
||||
import org.geysermc.geyser.translator.protocol.PacketTranslator;
|
||||
import org.geysermc.geyser.translator.protocol.Translator;
|
||||
|
@ -138,6 +140,11 @@ public class JavaCustomPayloadTranslator extends PacketTranslator<ClientboundCus
|
|||
|
||||
session.sendUpstreamPacket(toSend);
|
||||
});
|
||||
} else {
|
||||
session.ensureInEventLoop(() -> {
|
||||
EventBus eventBus = session.getGeyser().eventBus();
|
||||
eventBus.fire(new ServerCustomPayloadEvent(session, channel, packet.getData()));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ protocol-connection = "3.0.0.Beta1-20240411.165033-128"
|
|||
raknet = "1.0.0.CR3-20240416.144209-1"
|
||||
blockstateupdater="1.20.80-20240411.142413-1"
|
||||
mcauthlib = "d9d773e"
|
||||
mcprotocollib = "c1786e2" # Revert from jitpack after release
|
||||
mcprotocollib = "1234962" # Revert from jitpack after release
|
||||
adventure = "4.14.0"
|
||||
adventure-platform = "4.3.0"
|
||||
junit = "5.9.2"
|
||||
|
|
Loading…
Reference in New Issue