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

Merge remote-tracking branch 'origin/master' into feature/floodgate-merge

Browse source 
# Conflicts:
#	bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java
#	build-logic/build.gradle.kts
#	build.gradle.kts
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	settings.gradle.kts
This commit is contained in:
Tim203 2024-02-25 20:12:43 +01:00
commit a4681ca77c
No known key found for this signature in database
62 changed files with 2059 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/java/org/geysermc/geyser/api/pack/PathPackCodec.java
View file

@ -42,4 +42,4 @@ public abstract class PathPackCodec extends PackCodec {
*/
@NonNull
public abstract Path path();
}
}

2
api/src/main/java/org/geysermc/geyser/api/util/PlatformType.java
View file

@ -34,10 +34,12 @@ public record PlatformType(String platformName) {
public static final PlatformType ANDROID = new PlatformType("Android");
public static final PlatformType BUNGEECORD = new PlatformType("BungeeCord");
public static final PlatformType FABRIC = new PlatformType("Fabric");
public static final PlatformType NEOFORGE = new PlatformType("NeoForge");
public static final PlatformType SPIGOT = new PlatformType("Spigot");
@Deprecated
public static final PlatformType SPONGE = new PlatformType("Sponge");
public static final PlatformType STANDALONE = new PlatformType("Standalone");
public static final PlatformType VELOCITY = new PlatformType("Velocity");
public static final PlatformType VIAPROXY = new PlatformType("ViaProxy");
}