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

You shall compile!

Browse source
This commit is contained in:
Camotoy 2024-06-10 16:53:14 -04:00
parent f954dd9b48
commit 02179a798f
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
5 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java
View file

@ -74,7 +74,7 @@ public class JavaExplodeTranslator extends PacketTranslator<ClientboundExplodePa
// Not sure if the packet does anything - sending it just in case, because BDS still sends it. // Not sure if the packet does anything - sending it just in case, because BDS still sends it.
// TODO move out of packet translator class // TODO move out of packet translator class
Particle particle; Particle particle;
if (!(packet.getRadius() < 2f) && packet.getBlockInteraction() == ExplosionInteraction.KEEP) { if (!(packet.getRadius() < 2f) && packet.getBlockInteraction() != ExplosionInteraction.KEEP) {
particle = packet.getLargeExplosionParticles(); particle = packet.getLargeExplosionParticles();
} else { } else {
particle = packet.getSmallExplosionParticles(); particle = packet.getSmallExplosionParticles();

1
core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelEventTranslator.java
View file

@ -68,7 +68,6 @@ public class JavaLevelEventTranslator extends PacketTranslator<ClientboundLevelE
// Prioritize level events because it makes parrots dance. // Prioritize level events because it makes parrots dance.
SoundMapping mapping = Registries.SOUNDS.get(jukeboxSong.soundEvent().replace("minecraft:", "")); SoundMapping mapping = Registries.SOUNDS.get(jukeboxSong.soundEvent().replace("minecraft:", ""));
System.out.println(jukeboxSong.soundEvent() + " " + mapping);
SoundEvent soundEvent = null; SoundEvent soundEvent = null;
if (mapping != null) { if (mapping != null) {
String bedrock = mapping.getBedrock(); String bedrock = mapping.getBedrock();

1
core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelParticlesTranslator.java
View file

@ -177,7 +177,6 @@ public class JavaLevelParticlesTranslator extends PacketTranslator<ClientboundLe
} }
default -> { default -> {
ParticleMapping particleMapping = Registries.PARTICLES.get(particle.getType()); ParticleMapping particleMapping = Registries.PARTICLES.get(particle.getType());
System.out.println(particle.getType() + " " + particleMapping);
if (particleMapping == null) { //TODO ensure no particle can be null if (particleMapping == null) { //TODO ensure no particle can be null
return null; return null;
} }

2
core/src/main/resources/mappings

@ -1 +1 @@
Subproject commit 1f1d5ce8c482dac142f13e95e19368e3f36de144 Subproject commit 54705bcd2bcba830267efbb1fbfd4e52972c40f7

4
gradle/libs.versions.toml
View file

@ -13,7 +13,7 @@ websocket = "1.5.1"
protocol = "3.0.0.Beta2-20240606.172607-7" protocol = "3.0.0.Beta2-20240606.172607-7"
raknet = "1.0.0.CR3-20240416.144209-1" raknet = "1.0.0.CR3-20240416.144209-1"
mcauthlib = "e5b0bcc" mcauthlib = "e5b0bcc"
mcprotocollib = "1.21-SNAPSHOT" mcprotocollib = "784e91c"
adventure = "4.14.0" adventure = "4.14.0"
adventure-platform = "4.3.0" adventure-platform = "4.3.0"
junit = "5.9.2" junit = "5.9.2"
@ -107,7 +107,7 @@ guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" } junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }
mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" } mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" }
mcprotocollib = { group = "org.geysermc.mcprotocollib", name = "protocol", version.ref = "mcprotocollib" } mcprotocollib = { group = "com.github.GeyserMC", name = "mcprotocollib", version.ref = "mcprotocollib" }
raknet = { group = "org.cloudburstmc.netty", name = "netty-transport-raknet", version.ref = "raknet" } raknet = { group = "org.cloudburstmc.netty", name = "netty-transport-raknet", version.ref = "raknet" }
terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" } terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" }
velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" } velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }