From 3721cc084e4c9472fb82cc8c6f8a9d5d2021bf2c Mon Sep 17 00:00:00 2001 From: Jason Ho Date: Sat, 28 Mar 2020 16:50:50 -0700 Subject: [PATCH 01/22] Add packet translators for Play, Stop, and Builtin sounds --- .../player/JavaPlayerPlaySoundTranslator.java | 54 +++++++++ .../player/JavaPlayerStopSoundTranslator.java | 47 ++++++++ .../world/JavaPlayBuiltinSoundTranslator.java | 55 +++++++++ .../geysermc/connector/sound/SoundMap.java | 109 ++++++++++++++++++ .../org/geysermc/connector/utils/Toolbox.java | 5 + 5 files changed, 270 insertions(+) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java create mode 100644 connector/src/main/java/org/geysermc/connector/sound/SoundMap.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java new file mode 100644 index 000000000..cc3d2ff19 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java @@ -0,0 +1,54 @@ +package org.geysermc.connector.network.translators.java.entity.player; + +import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound; +import com.github.steveice10.mc.protocol.data.game.world.sound.CustomSound; +import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerPlaySoundPacket; +import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.packet.*; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.sound.SoundMap; + +public class JavaPlayerPlaySoundTranslator extends PacketTranslator { + + public static double processCoordinate(double f) { + return (f / 3D) * 8D; + } + + @Override + public void translate(ServerPlaySoundPacket packet, GeyserSession session) { + String packetSound; + if(packet.getSound() instanceof BuiltinSound) { + packetSound = ((BuiltinSound) packet.getSound()).getName(); + } else if(packet.getSound() instanceof CustomSound) { + packetSound = ((CustomSound) packet.getSound()).getName(); + } else { + session.getConnector().getLogger().debug("Unknown sound packet, we were unable to map this. " + packet.toString()); + return; + } + + SoundMap.SoundMapping soundMapping = SoundMap.get().fromJava(packetSound); + session.getConnector().getLogger() + .debug("[PlaySound] Sound mapping " + packetSound + " -> " + + soundMapping + (soundMapping == null ? "[not found]" : "") + + " - " + packet.toString()); + String playsound; + if(soundMapping == null || soundMapping.getPlaysound() == null) { + // no mapping + session.getConnector().getLogger() + .debug("[PlaySound] Defaulting to sound server gave us."); + playsound = packetSound; + } else { + playsound = soundMapping.getPlaysound(); + } + + PlaySoundPacket playSoundPacket = new PlaySoundPacket(); + playSoundPacket.setSound(playsound); + playSoundPacket.setPosition(Vector3f.from(processCoordinate(packet.getX()), processCoordinate(packet.getY()), processCoordinate(packet.getZ()))); + playSoundPacket.setVolume(packet.getVolume()); + playSoundPacket.setPitch(packet.getPitch()); + + session.getUpstream().sendPacket(playSoundPacket); + session.getConnector().getLogger().debug("[PlaySound] Packet sent - " + packet.toString() + " --> " + playSoundPacket); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java new file mode 100644 index 000000000..dfaab7a19 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java @@ -0,0 +1,47 @@ +package org.geysermc.connector.network.translators.java.entity.player; + +import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound; +import com.github.steveice10.mc.protocol.data.game.world.sound.CustomSound; +import com.github.steveice10.mc.protocol.packet.ingame.server.ServerStopSoundPacket; +import com.nukkitx.protocol.bedrock.packet.StopSoundPacket; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.sound.SoundMap; + +public class JavaPlayerStopSoundTranslator extends PacketTranslator { + + @Override + public void translate(ServerStopSoundPacket packet, GeyserSession session) { + String packetSound; + if(packet.getSound() instanceof BuiltinSound) { + packetSound = ((BuiltinSound) packet.getSound()).getName(); + } else if(packet.getSound() instanceof CustomSound) { + packetSound = ((CustomSound) packet.getSound()).getName(); + } else { + session.getConnector().getLogger().debug("Unknown sound packet, we were unable to map this. " + packet.toString()); + return; + } + SoundMap.SoundMapping soundMapping = SoundMap.get().fromJava(packetSound); + session.getConnector().getLogger() + .debug("[StopSound] Sound mapping " + packetSound + " -> " + + soundMapping + (soundMapping == null ? "[not found]" : "") + + " - " + packet.toString()); + String playsound; + if(soundMapping == null || soundMapping.getPlaysound() == null) { + // no mapping + session.getConnector().getLogger() + .debug("[StopSound] Defaulting to sound server gave us."); + playsound = packetSound; + } else { + playsound = soundMapping.getPlaysound(); + } + + StopSoundPacket stopSoundPacket = new StopSoundPacket(); + stopSoundPacket.setSoundName(playsound); + // packet not mapped in the library + stopSoundPacket.setStoppingAllSound(false); + + session.getUpstream().sendPacket(stopSoundPacket); + session.getConnector().getLogger().debug("[StopSound] Packet sent - " + packet.toString() + " --> " + stopSoundPacket); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java new file mode 100644 index 000000000..efde8d467 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java @@ -0,0 +1,55 @@ +package org.geysermc.connector.network.translators.java.world; + +import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerPlayBuiltinSoundPacket; +import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.data.SoundEvent; +import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.sound.SoundMap; + +public class JavaPlayBuiltinSoundTranslator extends PacketTranslator { + + @Override + public void translate(ServerPlayBuiltinSoundPacket packet, GeyserSession session) { + String packetSound = packet.getSound().getName(); + + SoundMap.SoundMapping soundMapping = SoundMap.get().fromJava(packetSound); + session.getConnector().getLogger() + .debug("[Builtin] Sound mapping " + packetSound + " -> " + + soundMapping + (soundMapping == null ? "[not found]" : "") + + " - " + packet.toString()); + if(soundMapping == null) { + return; + } + + LevelSoundEventPacket soundPacket = new LevelSoundEventPacket(); + SoundEvent sound = SoundMap.toSoundEvent(soundMapping.getBedrock()); + if(sound == null) { + sound = SoundMap.toSoundEvent(soundMapping.getBedrock()); + if(sound == null) { + sound = SoundMap.toSoundEvent(packetSound); + if(sound == null) { + session.getConnector().getLogger() + .debug("[Builtin] Sound for original " + packetSound + " to mappings " + soundPacket + + " was not a playable level sound, or has yet to be mapped to an enum in " + + "NukkitX SoundEvent "); + } else { + session.getConnector().getLogger() + .debug("[Builtin] Sound for original " + packetSound + " to mappings " + soundPacket + + " was not found in NukkitX SoundEvent, but original packet sound name was."); + } + return; + } + } + + soundPacket.setSound(sound); + soundPacket.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + soundPacket.setExtraData(-1); + soundPacket.setIdentifier(":"); // ??? + soundPacket.setBabySound(false); // might need to adjust this in the future + soundPacket.setRelativeVolumeDisabled(false); + session.getUpstream().sendPacket(soundPacket); + session.getConnector().getLogger().debug("Packet sent - " + packet.toString() + " --> " + soundPacket.toString()); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java b/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java new file mode 100644 index 000000000..ab11fe527 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java @@ -0,0 +1,109 @@ +package org.geysermc.connector.sound; + +import com.fasterxml.jackson.databind.JsonNode; +import com.nukkitx.protocol.bedrock.data.SoundEvent; +import lombok.Data; +import lombok.ToString; +import org.geysermc.connector.utils.Toolbox; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +public class SoundMap { + + private static SoundMap instance; + + public static SoundMap get() { + if(instance == null) { + instance = new SoundMap(make()); + } + return instance; + } + + private static ArrayList make() { + /* Load sound mappings */ + InputStream stream = Toolbox.getResource("mappings/sounds.json"); + JsonNode soundsTree; + try { + soundsTree = Toolbox.JSON_MAPPER.readTree(stream); + } catch (IOException e) { + throw new AssertionError("Unable to load sound mappings", e); + } + + ArrayList soundMappings = new ArrayList<>(); + Iterator> soundsIterator = soundsTree.fields(); + while(soundsIterator.hasNext()) { + Map.Entry next = soundsIterator.next(); + JsonNode brMap = next.getValue(); + + soundMappings.add( + new SoundMapping( + next.getKey(), + brMap.has("bedrock_mapping") && brMap.get("bedrock_mapping").isTextual() ? brMap.get("bedrock_mapping").asText() : null, + brMap.has("playsound_mapping") && brMap.get("playsound_mapping").isTextual() ? brMap.get("playsound_mapping").asText() : null + ) + ); + } + + + return soundMappings; + } + + private ArrayList sounds; + + public SoundMap(ArrayList sounds) { + this.sounds = sounds; + } + + /** + * Get's the sound mapping for a Java edition sound identifier + * @param java Java edition sound identifier + * @return SoundMapping object with information for bedrock, nukkit, java, etc. null if not found + */ + public SoundMapping fromJava(String java) { + for (SoundMapping sound : this.sounds) { + if(sound.getJava().equals(java)) { + return sound; + } + } + return null; + } + + + + public void refresh() { + this.sounds = make(); + } + + public static SoundEvent toSoundEvent(String s) { + SoundEvent sound; + try { + sound = SoundEvent.valueOf( + s + .toUpperCase() + .replaceAll("\\.", "_") + ); + return sound; + } catch(Exception e) { + return null; + } + } + + @Data + @ToString + public static class SoundMapping { + private final String java; + private final String bedrock; + private final String playsound; + + public SoundMapping(String java, String bedrock, String playsound) { + this.java = java; + this.bedrock = bedrock == null || bedrock.equalsIgnoreCase("") ? null : bedrock; + this.playsound = playsound == null || playsound.equalsIgnoreCase("") ? null : playsound; + } + } + +} diff --git a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java index 45802196b..db19ed2e1 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java +++ b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java @@ -39,6 +39,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.translators.item.ItemEntry; +import org.geysermc.connector.sound.SoundMap; + import java.io.InputStream; import java.util.*; @@ -103,6 +105,9 @@ public class Toolbox { entry.getValue().get("bedrock_id").intValue(), entry.getValue().get("bedrock_data").intValue())); itemIndex++; } + + /* Load sound mappings */ + SoundMap.get(); } public static InputStream getResource(String resource) { From 9e03c9b93ac5c205c51ef40984f6d48987c9d22f Mon Sep 17 00:00:00 2001 From: Jason Ho Date: Tue, 7 Apr 2020 18:11:27 -0700 Subject: [PATCH 02/22] Annotate sound translator classes --- .../java/entity/player/JavaPlayerPlaySoundTranslator.java | 2 ++ .../java/entity/player/JavaPlayerStopSoundTranslator.java | 2 ++ .../translators/java/world/JavaPlayBuiltinSoundTranslator.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java index cc3d2ff19..78d826dc7 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java @@ -7,8 +7,10 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.*; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.sound.SoundMap; +@Translator(packet = ServerPlaySoundPacket.class) public class JavaPlayerPlaySoundTranslator extends PacketTranslator { public static double processCoordinate(double f) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java index dfaab7a19..e67297326 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerStopSoundTranslator.java @@ -6,8 +6,10 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.ServerStopSoundPac import com.nukkitx.protocol.bedrock.packet.StopSoundPacket; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.sound.SoundMap; +@Translator(packet = ServerStopSoundPacket.class) public class JavaPlayerStopSoundTranslator extends PacketTranslator { @Override diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java index efde8d467..c862a334c 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java @@ -6,8 +6,10 @@ import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.sound.SoundMap; +@Translator(packet = ServerPlayBuiltinSoundPacket.class) public class JavaPlayBuiltinSoundTranslator extends PacketTranslator { @Override From 7993f384378c47a8665e9ea8a667751345bf5901 Mon Sep 17 00:00:00 2001 From: DoctorMacc Date: Wed, 8 Apr 2020 15:30:36 -0400 Subject: [PATCH 03/22] Prepare for PR --- .../java/world/JavaPlayBuiltinSoundTranslator.java | 9 ++++++++- .../main/java/org/geysermc/connector/sound/SoundMap.java | 7 +++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java index c862a334c..b824c89d4 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java @@ -47,7 +47,14 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator Date: Wed, 22 Apr 2020 18:17:34 -0500 Subject: [PATCH 04/22] Nitpicks and add serverbound sound packet translator --- .../BedrockLevelSoundEventTranslator.java | 41 +++++++++ .../player/JavaPlayerPlaySoundTranslator.java | 35 +++++-- .../player/JavaPlayerStopSoundTranslator.java | 29 +++++- .../world/JavaPlayBuiltinSoundTranslator.java | 35 ++++++- .../SoundMap.java => utils/SoundUtils.java} | 91 +++++++++---------- .../org/geysermc/connector/utils/Toolbox.java | 4 +- connector/src/main/resources/mappings | 2 +- 7 files changed, 173 insertions(+), 64 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLevelSoundEventTranslator.java rename connector/src/main/java/org/geysermc/connector/{sound/SoundMap.java => utils/SoundUtils.java} (53%) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLevelSoundEventTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLevelSoundEventTranslator.java new file mode 100644 index 000000000..c1c29e0bf --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockLevelSoundEventTranslator.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.bedrock; + +import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; + +@Translator(packet = LevelSoundEventPacket.class) +public class BedrockLevelSoundEventTranslator extends PacketTranslator { + + @Override + public void translate(LevelSoundEventPacket packet, GeyserSession session) { + // lol what even :thinking: + session.getUpstream().sendPacket(packet); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java index 78d826dc7..2bc3a794a 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java @@ -1,3 +1,28 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.java.entity.player; import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound; @@ -8,15 +33,11 @@ import com.nukkitx.protocol.bedrock.packet.*; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; -import org.geysermc.connector.sound.SoundMap; +import org.geysermc.connector.utils.SoundUtils; @Translator(packet = ServerPlaySoundPacket.class) public class JavaPlayerPlaySoundTranslator extends PacketTranslator { - public static double processCoordinate(double f) { - return (f / 3D) * 8D; - } - @Override public void translate(ServerPlaySoundPacket packet, GeyserSession session) { String packetSound; @@ -29,7 +50,7 @@ public class JavaPlayerPlaySoundTranslator extends PacketTranslator " + soundMapping + (soundMapping == null ? "[not found]" : "") @@ -46,7 +67,7 @@ public class JavaPlayerPlaySoundTranslator extends PacketTranslator { @@ -23,7 +48,7 @@ public class JavaPlayerStopSoundTranslator extends PacketTranslator " + soundMapping + (soundMapping == null ? "[not found]" : "") diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java index b824c89d4..a21dc3880 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java @@ -1,3 +1,28 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.java.world; import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerPlayBuiltinSoundPacket; @@ -7,7 +32,7 @@ import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; -import org.geysermc.connector.sound.SoundMap; +import org.geysermc.connector.utils.SoundUtils; @Translator(packet = ServerPlayBuiltinSoundPacket.class) public class JavaPlayBuiltinSoundTranslator extends PacketTranslator { @@ -16,7 +41,7 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator " + soundMapping + (soundMapping == null ? "[not found]" : "") @@ -26,11 +51,11 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator SOUNDS; - public static SoundMap get() { - if(instance == null) { - instance = new SoundMap(make()); - } - return instance; + public static void init() { + // no-op } - private static ArrayList make() { + static { /* Load sound mappings */ InputStream stream = Toolbox.getResource("mappings/sounds.json"); JsonNode soundsTree; @@ -33,14 +55,13 @@ public class SoundMap { throw new AssertionError("Unable to load sound mappings", e); } - ArrayList soundMappings = new ArrayList<>(); + Map soundMappings = new HashMap<>(); Iterator> soundsIterator = soundsTree.fields(); while(soundsIterator.hasNext()) { Map.Entry next = soundsIterator.next(); JsonNode brMap = next.getValue(); - soundMappings.add( - new SoundMapping( + soundMappings.put(next.getKey(), new SoundMapping( next.getKey(), brMap.has("bedrock_mapping") && brMap.get("bedrock_mapping").isTextual() ? brMap.get("bedrock_mapping").asText() : null, brMap.has("playsound_mapping") && brMap.get("playsound_mapping").isTextual() ? brMap.get("playsound_mapping").asText() : null, @@ -48,15 +69,7 @@ public class SoundMap { ) ); } - - - return soundMappings; - } - - private ArrayList sounds; - - public SoundMap(ArrayList sounds) { - this.sounds = sounds; + SOUNDS = soundMappings; } /** @@ -64,35 +77,22 @@ public class SoundMap { * @param java Java edition sound identifier * @return SoundMapping object with information for bedrock, nukkit, java, etc. null if not found */ - public SoundMapping fromJava(String java) { - for (SoundMapping sound : this.sounds) { - if(sound.getJava().equals(java)) { - return sound; - } - } - return null; + public static SoundMapping fromJava(String java) { + return SOUNDS.get(java); } - - - public void refresh() { - this.sounds = make(); - } - - public static SoundEvent toSoundEvent(String s) { - SoundEvent sound; + public static SoundEvent toSoundEvent(String sound) { try { - sound = SoundEvent.valueOf( - s - .toUpperCase() - .replaceAll("\\.", "_") - ); - return sound; - } catch(Exception e) { + return SoundEvent.valueOf(sound.toUpperCase().replaceAll("\\.", "_")); + } catch (IllegalArgumentException ex) { return null; } } + public static double processCoordinate(double f) { + return (f / 3D) * 8D; + } + @Data @ToString public static class SoundMapping { @@ -108,5 +108,4 @@ public class SoundMap { this.extraData = extraData; } } - } diff --git a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java index 28e185210..a4fa5cfb6 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java +++ b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java @@ -39,8 +39,6 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.translators.item.ItemEntry; -import org.geysermc.connector.sound.SoundMap; - import java.io.*; import java.util.*; @@ -109,7 +107,7 @@ public class Toolbox { } // Load sound mappings - SoundMap.get(); + SoundUtils.init(); // Load the locale data LocaleUtils.init(); } diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index efc9db6b7..9ecd90c71 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit efc9db6b7d51bdf145230933ac23b321ac1c132d +Subproject commit 9ecd90c71a26423a5f824554cce9b4236e544723 From b0a8b9219a75fc7f202e3777507f16db0fd6ccb3 Mon Sep 17 00:00:00 2001 From: DoctorMacc Date: Wed, 22 Apr 2020 23:40:49 -0500 Subject: [PATCH 05/22] Add effects support and block break particles/place sounds Co-authored-by: RednedEpic --- .../network/session/GeyserSession.java | 7 + .../bedrock/BedrockActionTranslator.java | 10 ++ ...BedrockInventoryTransactionTranslator.java | 27 ++++ .../network/translators/effect/Effect.java | 43 ++++++ .../player/JavaPlayerActionAckTranslator.java | 11 +- .../java/world/JavaBlockChangeTranslator.java | 22 ++++ .../java/world/JavaPlayEffectTranslator.java | 122 ++++++++++++++++++ .../world/JavaSpawnParticleTranslator.java | 105 +++++++++++++++ .../geysermc/connector/utils/EffectUtils.java | 106 +++++++++++++++ .../org/geysermc/connector/utils/Toolbox.java | 4 +- connector/src/main/resources/mappings | 2 +- 11 files changed, 455 insertions(+), 4 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/effect/Effect.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayEffectTranslator.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaSpawnParticleTranslator.java create mode 100644 connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index 12ae39bfc..7aaed75fc 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -30,6 +30,7 @@ import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsExcepti import com.github.steveice10.mc.auth.exception.request.RequestException; import com.github.steveice10.mc.protocol.MinecraftProtocol; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; +import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.mc.protocol.packet.ingame.server.ServerRespawnPacket; import com.github.steveice10.mc.protocol.packet.handshake.client.HandshakePacket; import com.github.steveice10.packetlib.Client; @@ -126,6 +127,12 @@ public class GeyserSession implements CommandSender { @Setter private boolean jumping; + @Setter + private BlockState breakingBlock; + + @Setter + private Vector3i lastBlockPlacePosition; + @Setter private boolean switchingDimension = false; private boolean manyDimPackets = false; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java index 7ab713893..43e0a5704 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java @@ -27,6 +27,10 @@ package org.geysermc.connector.network.translators.bedrock; import java.util.concurrent.TimeUnit; +import com.nukkitx.protocol.bedrock.data.LevelEventType; +import com.nukkitx.protocol.bedrock.data.SoundEvent; +import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; +import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.connector.entity.Entity; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; @@ -41,6 +45,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlaye import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket; import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket; +import org.geysermc.connector.network.translators.block.BlockTranslator; @Translator(packet = PlayerActionPacket.class) public class BedrockActionTranslator extends PacketTranslator { @@ -107,6 +112,11 @@ public class BedrockActionTranslator extends PacketTranslator { + + @Override + public void translate(ServerPlayEffectPacket packet, GeyserSession session) { + LevelEventPacket effect = new LevelEventPacket(); + // Some things here are particles, others are not + if (packet.getEffect() instanceof ParticleEffect) { + ParticleEffect particleEffect = (ParticleEffect) packet.getEffect(); + Effect geyserEffect = EffectUtils.EFFECTS.get(particleEffect.name()); + if (geyserEffect != null) { + String name = geyserEffect.getBedrockName(); + effect.setType(LevelEventType.valueOf(name)); + } else { + switch (particleEffect) { + // TODO: BREAK_SPLASH_POTION has additional data + // TODO: Block break doesn't work when you're the player. + case BONEMEAL_GROW: + effect.setType(LevelEventType.BONEMEAL); + BonemealGrowEffectData growEffectData = (BonemealGrowEffectData) packet.getData(); + effect.setData(growEffectData.getParticleCount()); + break; + //TODO: Block break particles when under fire + case BREAK_BLOCK: + effect.setType(LevelEventType.DESTROY); + BreakBlockEffectData breakBlockEffectData = (BreakBlockEffectData) packet.getData(); + effect.setData(BlockTranslator.getBedrockBlockId(breakBlockEffectData.getBlockState())); + break; + // TODO: Check these three + case EXPLOSION: + effect.setType(LevelEventType.PARTICLE_EXPLODE); + break; + case MOB_SPAWN: + effect.setType(LevelEventType.ENTITY_SPAWN); + break; + // Done with a dispenser + case SMOKE: + // Might need to be SHOOT + effect.setType(LevelEventType.PARTICLE_SMOKE); + break; + default: + GeyserConnector.getInstance().getLogger().debug("No effect handling for particle effect: " + packet.getEffect()); + } + } + effect.setPosition(Vector3f.from(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ())); + session.getUpstream().sendPacket(effect); + } else if (packet.getEffect() instanceof SoundEffect) { + SoundEffect soundEffect = (SoundEffect) packet.getEffect(); + Effect geyserEffect = EffectUtils.EFFECTS.get(soundEffect.name()); + if (geyserEffect != null) { + // Some events are LevelEventTypes, some are SoundEvents. + if (geyserEffect.getType().equals("soundLevel")) { + // TODO: Opening doors also does not work as the player + effect.setType(LevelEventType.valueOf(geyserEffect.getBedrockName())); + } else if (geyserEffect.getType().equals("soundEvent")) { + LevelSoundEvent2Packet soundEvent = new LevelSoundEvent2Packet(); + // Separate case since each RecordEffectData in Java is an individual track in Bedrock + if (geyserEffect.getJavaName().equals("RECORD")) { + RecordEffectData recordEffectData = (RecordEffectData) packet.getData(); + soundEvent.setSound(EffectUtils.RECORDS.get(recordEffectData.getRecordId())); + } else { + soundEvent.setSound(SoundEvent.valueOf(geyserEffect.getBedrockName())); + } + soundEvent.setExtraData(geyserEffect.getData()); + soundEvent.setIdentifier(geyserEffect.getIdentifier()); + soundEvent.setPosition(Vector3f.from(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ())); + session.getUpstream().sendPacket(soundEvent); + } + } else { + GeyserConnector.getInstance().getLogger().debug("No effect handling for sound effect: " + packet.getEffect()); + } + } + if (effect.getType() != null) { + effect.setPosition(Vector3f.from(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ())); + session.getUpstream().sendPacket(effect); + } + + } +} \ No newline at end of file diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaSpawnParticleTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaSpawnParticleTranslator.java new file mode 100644 index 000000000..4dd62647a --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaSpawnParticleTranslator.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.java.world; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; +import com.github.steveice10.mc.protocol.data.game.world.particle.*; +import com.nukkitx.protocol.bedrock.data.ItemData; +import com.nukkitx.protocol.bedrock.data.LevelEventType; +import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; +import com.nukkitx.protocol.bedrock.packet.SpawnParticleEffectPacket; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; +import org.geysermc.connector.network.translators.Translators; +import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.utils.EffectUtils; + +import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerSpawnParticlePacket; +import com.nukkitx.math.vector.Vector3f; + +@Translator(packet = ServerSpawnParticlePacket.class) +public class JavaSpawnParticleTranslator extends PacketTranslator { + + @Override + public void translate(ServerSpawnParticlePacket packet, GeyserSession session) { + LevelEventPacket particle = new LevelEventPacket(); + switch (packet.getParticle().getType()) { + case BLOCK: + particle.setType(LevelEventType.DESTROY); + particle.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + particle.setData(BlockTranslator.getBedrockBlockId(((BlockParticleData) packet.getParticle().getData()).getBlockState())); + session.getUpstream().sendPacket(particle); + break; + case FALLING_DUST: + //In fact, FallingDustParticle should have data like DustParticle, + //but in MCProtocol, its data is BlockState(1). + particle.setType(LevelEventType.PARTICLE_FALLING_DUST); + particle.setData(BlockTranslator.getBedrockBlockId(((FallingDustParticleData)packet.getParticle().getData()).getBlockState())); + particle.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + session.getUpstream().sendPacket(particle); + break; + case ITEM: + ItemStack javaItem = ((ItemParticleData)packet.getParticle().getData()).getItemStack(); + ItemData bedrockItem = Translators.getItemTranslator().translateToBedrock(session, javaItem); + int id = bedrockItem.getId(); + short damage = bedrockItem.getDamage(); + particle.setType(LevelEventType.PARTICLE_ITEM_BREAK); + particle.setData(id << 16 | damage); + particle.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + session.getUpstream().sendPacket(particle); + break; + case DUST: + DustParticleData data = (DustParticleData)packet.getParticle().getData(); + int r = (int) (data.getRed()*255); + int g = (int) (data.getGreen()*255); + int b = (int) (data.getBlue()*255); + particle.setType(LevelEventType.PARTICLE_FALLING_DUST); + particle.setData(((0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff)); + particle.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + session.getUpstream().sendPacket(particle); + break; + default: + LevelEventType typeParticle = EffectUtils.getParticleLevelEventType(packet.getParticle().getType()); + if (typeParticle != null) { + particle.setType(typeParticle); + particle.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + session.getUpstream().sendPacket(particle); + } else { + String stringParticle = EffectUtils.getParticleString(packet.getParticle().getType()); + if (stringParticle != null) { + SpawnParticleEffectPacket stringPacket = new SpawnParticleEffectPacket(); + stringPacket.setIdentifier(stringParticle); + stringPacket.setDimensionId(session.getPlayerEntity().getDimension()); + stringPacket.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ())); + session.getUpstream().sendPacket(stringPacket); + } + } + break; + } + } + +} \ No newline at end of file diff --git a/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java b/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java new file mode 100644 index 000000000..d5a78e22e --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java @@ -0,0 +1,106 @@ +package org.geysermc.connector.utils; + +import com.fasterxml.jackson.databind.JsonNode; +import com.github.steveice10.mc.protocol.data.game.world.particle.ParticleType; +import com.nukkitx.protocol.bedrock.data.LevelEventType; +import com.nukkitx.protocol.bedrock.data.SoundEvent; + +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; + +import lombok.NonNull; + +import org.geysermc.connector.GeyserConnector; +import org.geysermc.connector.network.translators.effect.Effect; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +public class EffectUtils { + + public static final Map EFFECTS = new HashMap<>(); + public static final Int2ObjectMap RECORDS = new Int2ObjectOpenHashMap<>(); + + private static Map particleTypeMap = new HashMap<>(); + private static Map particleStringMap = new HashMap<>(); + + public static void init() { + // no-op + } + + static { + /* Load particles */ + InputStream particleStream = Toolbox.getResource("mappings/particles.json"); + JsonNode particleEntries; + try { + particleEntries = Toolbox.JSON_MAPPER.readTree(particleStream); + } catch (Exception e) { + throw new AssertionError("Unable to load particle map", e); + } + + Iterator> particlesIterator = particleEntries.fields(); + while (particlesIterator.hasNext()) { + Map.Entry entry = particlesIterator.next(); + try { + setIdentifier(ParticleType.valueOf(entry.getKey().toUpperCase()), LevelEventType.valueOf(entry.getValue().asText().toUpperCase())); + } catch (IllegalArgumentException e1) { + try { + setIdentifier(ParticleType.valueOf(entry.getKey().toUpperCase()), entry.getValue().asText()); + GeyserConnector.getInstance().getLogger().debug("Force to map particle " + + entry.getKey() + + "=>" + + entry.getValue().asText() + + ", it will take effect."); + } catch (IllegalArgumentException e2){ + GeyserConnector.getInstance().getLogger().warning("Fail to map particle " + entry.getKey() + "=>" + entry.getValue().asText()); + } + } + } + + /* Load effects */ + InputStream effectsStream = Toolbox.getResource("mappings/effects.json"); + JsonNode effects; + try { + effects = Toolbox.JSON_MAPPER.readTree(effectsStream); + } catch (Exception e) { + throw new AssertionError("Unable to load effects mappings", e); + } + + Iterator> effectsIterator = effects.fields(); + while (effectsIterator.hasNext()) { + Map.Entry entry = effectsIterator.next(); + // Separate records database since they're handled differently between the two versions + if (entry.getValue().has("records")) { + JsonNode records = entry.getValue().get("records"); + Iterator> recordsIterator = records.fields(); + while (recordsIterator.hasNext()) { + Map.Entry recordEntry = recordsIterator.next(); + RECORDS.put(Integer.parseInt(recordEntry.getKey()), SoundEvent.valueOf(recordEntry.getValue().asText())); + } + } + String identifier = (entry.getValue().has("identifier")) ? entry.getValue().get("identifier").asText() : ""; + int data = (entry.getValue().has("data")) ? entry.getValue().get("data").asInt() : -1; + Effect effect = new Effect(entry.getKey(), entry.getValue().get("name").asText(), entry.getValue().get("type").asText(), data, identifier); + EFFECTS.put(entry.getKey(), effect); + } + } + + public static void setIdentifier(ParticleType type, LevelEventType identifier) { + particleTypeMap.put(type, identifier); + } + + public static void setIdentifier(ParticleType type, String identifier) { + particleStringMap.put(type, identifier); + } + + public static LevelEventType getParticleLevelEventType(@NonNull ParticleType type) { + return particleTypeMap.getOrDefault(type, null); + } + + public static String getParticleString(@NonNull ParticleType type){ + return particleStringMap.getOrDefault(type, null); + } + +} \ No newline at end of file diff --git a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java index 24cea5806..9dbc51abd 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java +++ b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java @@ -128,7 +128,9 @@ public class Toolbox { } itemIndex++; } - + + // Load particle/effect mappings + EffectUtils.init(); // Load sound mappings SoundUtils.init(); // Load the locale data diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index 9ecd90c71..b03f56113 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit 9ecd90c71a26423a5f824554cce9b4236e544723 +Subproject commit b03f56113199a1a360efc68d2a80b8f706c6f56d From 09297a467ceaa20ffc37477d44639193057d65dc Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Wed, 22 Apr 2020 23:51:22 -0500 Subject: [PATCH 06/22] Update submodules --- connector/src/main/resources/mappings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index b03f56113..4d53e24f9 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit b03f56113199a1a360efc68d2a80b8f706c6f56d +Subproject commit 4d53e24f92d20e51909ee48ac28ed17f92cb819e From 79185fabb55600da337fa408da2e69a425c9da52 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Thu, 23 Apr 2020 01:01:33 -0500 Subject: [PATCH 07/22] Only send block sounds when a block is being placed Previously, any time a block was clicked whether it be with a block in the hand or not, a sound would play. This checks if the item in the players hand is indeed a block as well as the same block in the UpdateBlockPacket, and properly plays the packet. --- connector/pom.xml | 6 ++++ .../network/session/GeyserSession.java | 3 ++ ...BedrockInventoryTransactionTranslator.java | 30 ++++++++++--------- .../translators/block/BlockTranslator.java | 8 ++++- .../network/translators/item/ItemEntry.java | 4 ++- .../translators/item/ToolItemEntry.java | 4 +-- .../java/world/JavaBlockChangeTranslator.java | 16 ++++++++++ .../org/geysermc/connector/utils/Toolbox.java | 9 ++++-- 8 files changed, 59 insertions(+), 21 deletions(-) diff --git a/connector/pom.xml b/connector/pom.xml index 9e223d4ea..a0142efb7 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -90,6 +90,12 @@ 8.3.1 compile + + com.google.guava + guava + 29.0-jre + compile + com.github.steveice10 opennbt diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index 7aaed75fc..bb0878b67 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -133,6 +133,9 @@ public class GeyserSession implements CommandSender { @Setter private Vector3i lastBlockPlacePosition; + @Setter + private String lastBlockPlacedId; + @Setter private boolean switchingDimension = false; private boolean manyDimPackets = false; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java index c6a5e7bd9..f17df09b2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java @@ -26,19 +26,6 @@ package org.geysermc.connector.network.translators.bedrock; import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerPlaceBlockPacket; -import com.nukkitx.math.vector.Vector3i; -import org.geysermc.connector.entity.Entity; -import org.geysermc.connector.inventory.Inventory; -import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.ItemStackTranslator; -import org.geysermc.connector.network.translators.PacketTranslator; -import org.geysermc.connector.network.translators.Translator; -import org.geysermc.connector.network.translators.Translators; -import org.geysermc.connector.network.translators.block.BlockTranslator; -import org.geysermc.connector.network.translators.item.ItemTranslator; -import org.geysermc.connector.utils.InventoryUtils; - -import com.nukkitx.math.vector.Vector3f; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; @@ -48,8 +35,19 @@ import com.github.steveice10.mc.protocol.data.game.world.block.BlockFace; import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerActionPacket; import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerInteractEntityPacket; import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerUseItemPacket; +import com.nukkitx.math.vector.Vector3i; +import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; +import org.geysermc.connector.entity.Entity; +import org.geysermc.connector.inventory.Inventory; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; +import org.geysermc.connector.network.translators.Translators; +import org.geysermc.connector.network.translators.item.ItemEntry; +import org.geysermc.connector.utils.InventoryUtils; + @Translator(packet = InventoryTransactionPacket.class) public class BedrockInventoryTransactionTranslator extends PacketTranslator { @@ -99,7 +97,11 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>(); - private static final Map JAVA_ID_BLOCK_MAP = new HashMap<>(); + private static final BiMap JAVA_ID_BLOCK_MAP = HashBiMap.create(); private static final IntSet WATERLOGGED = new IntOpenHashSet(); // Bedrock carpet ID, used in LlamaEntity.java for decoration @@ -265,6 +267,10 @@ public class BlockTranslator { return WATERLOGGED.contains(state.getId()); } + public static BiMap getJavaIdBlockMap() { + return JAVA_ID_BLOCK_MAP; + } + public static BlockState getJavaWaterloggedState(int bedrockId) { return BEDROCK_TO_JAVA_BLOCK_MAP.get(1 << 31 | bedrockId); } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java index e579c20ee..e5c803292 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java @@ -32,7 +32,7 @@ import lombok.Getter; @AllArgsConstructor public class ItemEntry { - public static ItemEntry AIR = new ItemEntry("minecraft:air", 0, 0, 0); + public static ItemEntry AIR = new ItemEntry("minecraft:air", 0, 0, 0, false); private final String javaIdentifier; private final int javaId; @@ -40,6 +40,8 @@ public class ItemEntry { private final int bedrockId; private final int bedrockData; + private final boolean block; + @Override public boolean equals(Object obj) { return obj == this || (obj instanceof ItemEntry && ((ItemEntry) obj).getBedrockId() == this.getBedrockId() && ((ItemEntry) obj).getJavaIdentifier().equals(this.getJavaIdentifier())); diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java index 5d1ddd262..cfc05a4a9 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java @@ -7,8 +7,8 @@ public class ToolItemEntry extends ItemEntry { private final String toolType; private final String toolTier; - public ToolItemEntry(String javaIdentifier, int javaId, int bedrockId, int bedrockData, String toolType, String toolTier) { - super(javaIdentifier, javaId, bedrockId, bedrockData); + public ToolItemEntry(String javaIdentifier, int javaId, int bedrockId, int bedrockData, String toolType, String toolTier, boolean isBlock) { + super(javaIdentifier, javaId, bedrockId, bedrockData, isBlock); this.toolType = toolType; this.toolTier = toolTier; } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java index 08bd3cb60..ec40e27aa 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java @@ -51,6 +51,21 @@ public class JavaBlockChangeTranslator extends PacketTranslator Date: Thu, 23 Apr 2020 02:12:50 -0500 Subject: [PATCH 08/22] Add missing license header from EffectUtils --- .../geysermc/connector/utils/EffectUtils.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java b/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java index d5a78e22e..7c1690e48 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/EffectUtils.java @@ -1,3 +1,28 @@ +/* + * Copyright (c) 2019-2020 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.connector.utils; import com.fasterxml.jackson.databind.JsonNode; @@ -103,4 +128,4 @@ public class EffectUtils { return particleStringMap.getOrDefault(type, null); } -} \ No newline at end of file +} From 31be608038723a2c06f4f1d308d2cf0da553c9eb Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Wed, 29 Apr 2020 15:01:53 -0500 Subject: [PATCH 09/22] Add block break sounds for blocks with 0 hardness, and refactor some things The refactors in this commit go a bit beyond the scope of what the sound/effects branch was meant to accomplish, however most of these changes are necessary so chunk caching could be reintroduced for the standalone version. The chunk caching here allows for us to get the block ID before the block was broken, and in the future allow us to implement newer features. Chunk caching is optional (and disabled by default) as on non-Bukkit versions, it can eat up a lot of RAM with many players online. --- .../bukkit/GeyserBukkitConfiguration.java | 9 +- .../platform/bukkit/GeyserBukkitLogger.java | 4 +- .../platform/bukkit/GeyserBukkitPlugin.java | 14 +- .../world/GeyserBukkitWorldManager.java | 24 +-- .../bungeecord/GeyserBungeeConfiguration.java | 9 +- .../bungeecord/GeyserBungeeLogger.java | 4 +- .../bungeecord/GeyserBungeePlugin.java | 4 +- .../sponge/GeyserSpongeConfiguration.java | 9 +- .../platform/sponge/GeyserSpongeLogger.java | 4 +- .../platform/sponge/GeyserSpongePlugin.java | 5 +- bootstrap/standalone/pom.xml | 4 +- ...ap.java => GeyserStandaloneBootstrap.java} | 16 +- ...ava => GeyserStandaloneConfiguration.java} | 8 +- ...ogger.java => GeyserStandaloneLogger.java} | 40 ++--- .../platform/standalone/LoopbackUtil.java | 3 +- .../velocity/GeyserVelocityConfiguration.java | 7 +- .../velocity/GeyserVelocityLogger.java | 4 +- .../velocity/GeyserVelocityPlugin.java | 4 +- .../geysermc/common/IGeyserConfiguration.java | 87 ----------- .../common/bootstrap/IGeyserBootstrap.java | 64 -------- .../geysermc/common/logger/IGeyserLogger.java | 81 ---------- .../connector/GeyserConfiguration.java | 90 +++++++++++ .../geysermc/connector/GeyserConnector.java | 25 +-- .../org/geysermc/connector/GeyserLogger.java | 82 ++++++++++ .../connector/bootstrap/GeyserBootstrap.java | 78 ++++++++++ .../connector/command/CommandManager.java | 12 +- .../connector/entity/FallingBlockEntity.java | 2 +- .../living/animal/horse/LlamaEntity.java | 2 +- .../entity/living/monster/EndermanEntity.java | 2 +- .../network/ConnectorServerEventHandler.java | 9 +- .../network/UpstreamPacketHandler.java | 4 +- .../network/session/GeyserSession.java | 11 +- .../network/session/cache/ChunkCache.java | 43 +++--- .../network/translators/Translators.java | 6 +- .../bedrock/BedrockActionTranslator.java | 4 +- ...BedrockInventoryTransactionTranslator.java | 32 +++- .../inventory/BlockInventoryTranslator.java | 2 +- .../DoubleChestInventoryTranslator.java | 2 +- .../holder/BlockInventoryHolder.java | 2 +- .../player/JavaPlayerActionAckTranslator.java | 19 +-- .../java/world/JavaBlockChangeTranslator.java | 2 +- .../java/world/JavaChunkDataTranslator.java | 6 +- .../java/world/JavaPlayEffectTranslator.java | 2 +- .../world/JavaSpawnParticleTranslator.java | 2 +- .../java/world/JavaUnloadChunkTranslator.java | 2 +- .../world/JavaUpdateTileEntityTranslator.java | 4 +- .../translators/world/CachedChunkManager.java | 39 +++++ .../translators/world/WorldManager.java | 52 +++++++ .../{ => world}/block/BlockStateValues.java | 2 +- .../{ => world}/block/BlockTranslator.java | 6 +- .../entity/BannerBlockEntityTranslator.java | 4 +- .../entity/BedBlockEntityTranslator.java | 4 +- .../{ => world}/block/entity/BlockEntity.java | 2 +- .../block/entity/BlockEntityTranslator.java | 2 +- .../entity/CampfireBlockEntityTranslator.java | 2 +- .../entity/EmptyBlockEntityTranslator.java | 2 +- .../EndGatewayBlockEntityTranslator.java | 2 +- .../block/entity/RequiresBlockState.java | 2 +- .../entity/SignBlockEntityTranslator.java | 2 +- .../entity/SkullBlockEntityTranslator.java | 142 +++++++++--------- .../world/chunk/BlockStorage.java | 30 +++- .../world/chunk/ChunkPosition.java | 54 +++++++ .../world/chunk/ChunkSection.java | 26 +++- .../translators}/world/chunk/NibbleArray.java | 26 +++- .../world/chunk/bitarray/BitArray.java | 42 ++++++ .../world/chunk/bitarray/BitArrayVersion.java | 26 +++- .../world/chunk/bitarray/PaddedBitArray.java | 26 +++- .../world/chunk/bitarray/Pow2BitArray.java | 26 +++- .../connector/utils/BlockEntityUtils.java | 2 +- .../geysermc/connector/utils/BlockUtils.java | 2 +- .../geysermc/connector/utils/ChunkUtils.java | 11 +- .../connector/world/chunk/ChunkPosition.java | 53 ------- .../world/chunk/bitarray/BitArray.java | 26 ---- connector/src/main/resources/config.yml | 9 ++ 74 files changed, 873 insertions(+), 598 deletions(-) rename common/src/main/java/org/geysermc/common/command/ICommandManager.java => bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/world/GeyserBukkitWorldManager.java (64%) rename bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/{GeyserBootstrap.java => GeyserStandaloneBootstrap.java} (87%) rename bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/{GeyserConfiguration.java => GeyserStandaloneConfiguration.java} (94%) rename bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/{console/GeyserLogger.java => GeyserStandaloneLogger.java} (64%) delete mode 100644 common/src/main/java/org/geysermc/common/IGeyserConfiguration.java delete mode 100644 common/src/main/java/org/geysermc/common/bootstrap/IGeyserBootstrap.java delete mode 100644 common/src/main/java/org/geysermc/common/logger/IGeyserLogger.java create mode 100644 connector/src/main/java/org/geysermc/connector/GeyserConfiguration.java create mode 100644 connector/src/main/java/org/geysermc/connector/GeyserLogger.java create mode 100644 connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/world/CachedChunkManager.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/BlockStateValues.java (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/BlockTranslator.java (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/BannerBlockEntityTranslator.java (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/BedBlockEntityTranslator.java (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/BlockEntity.java (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/BlockEntityTranslator.java (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/CampfireBlockEntityTranslator.java (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/EmptyBlockEntityTranslator.java (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/EndGatewayBlockEntityTranslator.java (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/RequiresBlockState.java (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/SignBlockEntityTranslator.java (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/{ => world}/block/entity/SkullBlockEntityTranslator.java (93%) rename connector/src/main/java/org/geysermc/connector/{ => network/translators}/world/chunk/BlockStorage.java (68%) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkPosition.java rename connector/src/main/java/org/geysermc/connector/{ => network/translators}/world/chunk/ChunkSection.java (77%) rename connector/src/main/java/org/geysermc/connector/{ => network/translators}/world/chunk/NibbleArray.java (62%) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java rename connector/src/main/java/org/geysermc/connector/{ => network/translators}/world/chunk/bitarray/BitArrayVersion.java (60%) rename connector/src/main/java/org/geysermc/connector/{ => network/translators}/world/chunk/bitarray/PaddedBitArray.java (65%) rename connector/src/main/java/org/geysermc/connector/{ => network/translators}/world/chunk/bitarray/Pow2BitArray.java (67%) delete mode 100644 connector/src/main/java/org/geysermc/connector/world/chunk/ChunkPosition.java delete mode 100644 connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArray.java diff --git a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitConfiguration.java b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitConfiguration.java index 5b8842b4e..37ba44f92 100644 --- a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitConfiguration.java +++ b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitConfiguration.java @@ -26,7 +26,7 @@ package org.geysermc.platform.bukkit; import org.bukkit.configuration.file.FileConfiguration; -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import java.io.File; import java.nio.file.Path; @@ -34,7 +34,7 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; -public class GeyserBukkitConfiguration implements IGeyserConfiguration { +public class GeyserBukkitConfiguration implements GeyserConfiguration { private FileConfiguration config; private File dataFolder; @@ -111,6 +111,11 @@ public class GeyserBukkitConfiguration implements IGeyserConfiguration { return Paths.get(dataFolder.toString(), config.getString("floodgate-key-file", "public-key.pem")); } + @Override + public boolean isCacheChunks() { + return true; // We override this as with Bukkit, we have direct access to the server implementation + } + @Override public IMetricsInfo getMetrics() { return metricsInfo; diff --git a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitLogger.java b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitLogger.java index 454ec9f6e..08822568c 100644 --- a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitLogger.java +++ b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitLogger.java @@ -27,13 +27,13 @@ package org.geysermc.platform.bukkit; import lombok.AllArgsConstructor; -import org.geysermc.common.logger.IGeyserLogger; +import org.geysermc.connector.GeyserLogger; import java.util.logging.Level; import java.util.logging.Logger; @AllArgsConstructor -public class GeyserBukkitLogger implements IGeyserLogger { +public class GeyserBukkitLogger implements GeyserLogger { private Logger logger; private boolean debugMode; diff --git a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java index c2662695e..d5226245a 100644 --- a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java +++ b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java @@ -27,20 +27,22 @@ package org.geysermc.platform.bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.geysermc.common.PlatformType; -import org.geysermc.common.command.ICommandManager; import org.geysermc.connector.GeyserConnector; -import org.geysermc.common.bootstrap.IGeyserBootstrap; +import org.geysermc.connector.bootstrap.GeyserBootstrap; import org.geysermc.connector.command.CommandManager; +import org.geysermc.connector.network.translators.world.WorldManager; import org.geysermc.platform.bukkit.command.GeyserBukkitCommandExecutor; import org.geysermc.platform.bukkit.command.GeyserBukkitCommandManager; +import org.geysermc.platform.bukkit.world.GeyserBukkitWorldManager; import java.util.UUID; -public class GeyserBukkitPlugin extends JavaPlugin implements IGeyserBootstrap { +public class GeyserBukkitPlugin extends JavaPlugin implements GeyserBootstrap { private GeyserBukkitCommandManager geyserCommandManager; private GeyserBukkitConfiguration geyserConfig; private GeyserBukkitLogger geyserLogger; + private GeyserBukkitWorldManager geyserWorldManager; private GeyserConnector connector; @@ -58,6 +60,7 @@ public class GeyserBukkitPlugin extends JavaPlugin implements IGeyserBootstrap { this.connector = GeyserConnector.start(PlatformType.BUKKIT, this); this.geyserCommandManager = new GeyserBukkitCommandManager(this, connector); + this.geyserWorldManager = new GeyserBukkitWorldManager(); this.getCommand("geyser").setExecutor(new GeyserBukkitCommandExecutor(connector)); } @@ -81,4 +84,9 @@ public class GeyserBukkitPlugin extends JavaPlugin implements IGeyserBootstrap { public CommandManager getGeyserCommandManager() { return this.geyserCommandManager; } + + @Override + public WorldManager getWorldManager() { + return this.geyserWorldManager; + } } diff --git a/common/src/main/java/org/geysermc/common/command/ICommandManager.java b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/world/GeyserBukkitWorldManager.java similarity index 64% rename from common/src/main/java/org/geysermc/common/command/ICommandManager.java rename to bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/world/GeyserBukkitWorldManager.java index f46dfafcd..6172b8314 100644 --- a/common/src/main/java/org/geysermc/common/command/ICommandManager.java +++ b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/world/GeyserBukkitWorldManager.java @@ -21,18 +21,22 @@ * * @author GeyserMC * @link https://github.com/GeyserMC/Geyser + * */ -package org.geysermc.common.command; +package org.geysermc.platform.bukkit.world; -public interface ICommandManager { +import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; - /** - * Returns the description of the given command - * - * @param command Command to get the description for - * - * @return Command description - */ - String getDescription(String command); +import org.bukkit.Bukkit; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.world.WorldManager; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; + +public class GeyserBukkitWorldManager extends WorldManager { + + @Override + public BlockState getBlockAt(GeyserSession session, int x, int y, int z) { + return BlockTranslator.getJavaIdBlockMap().get(Bukkit.getPlayer(session.getName()).getWorld().getBlockAt(x, y, z).getBlockData().getAsString()); + } } diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java index e0f6a6eff..85971d0f7 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java @@ -27,7 +27,7 @@ package org.geysermc.platform.bungeecord; import net.md_5.bungee.config.Configuration; -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import java.io.File; import java.nio.file.Path; @@ -35,7 +35,7 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; -public class GeyserBungeeConfiguration implements IGeyserConfiguration { +public class GeyserBungeeConfiguration implements GeyserConfiguration { private File dataFolder; private Configuration config; @@ -112,6 +112,11 @@ public class GeyserBungeeConfiguration implements IGeyserConfiguration { return Paths.get(dataFolder.toString(), config.getString("floodgate-key-file", "public-key.pem")); } + @Override + public boolean isCacheChunks() { + return config.getBoolean("cache-chunks", false); + } + @Override public BungeeMetricsInfo getMetrics() { return metricsInfo; diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeLogger.java b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeLogger.java index 7aba88bcd..cd07b333d 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeLogger.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeLogger.java @@ -25,12 +25,12 @@ package org.geysermc.platform.bungeecord; -import org.geysermc.common.logger.IGeyserLogger; +import org.geysermc.connector.GeyserLogger; import java.util.logging.Level; import java.util.logging.Logger; -public class GeyserBungeeLogger implements IGeyserLogger { +public class GeyserBungeeLogger implements GeyserLogger { private Logger logger; private boolean debugMode; diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java index 9c3934cff..3483c2938 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java @@ -32,7 +32,7 @@ import net.md_5.bungee.config.YamlConfiguration; import org.geysermc.common.PlatformType; import org.geysermc.connector.GeyserConnector; -import org.geysermc.common.bootstrap.IGeyserBootstrap; +import org.geysermc.connector.bootstrap.GeyserBootstrap; import org.geysermc.connector.command.CommandManager; import org.geysermc.platform.bungeecord.command.GeyserBungeeCommandExecutor; import org.geysermc.platform.bungeecord.command.GeyserBungeeCommandManager; @@ -44,7 +44,7 @@ import java.nio.file.Files; import java.util.UUID; import java.util.logging.Level; -public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap { +public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap { private GeyserBungeeCommandManager geyserCommandManager; private GeyserBungeeConfiguration geyserConfig; diff --git a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java index be4923e2b..efcf489d4 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java @@ -29,7 +29,7 @@ import lombok.AllArgsConstructor; import ninja.leaping.configurate.ConfigurationNode; -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import java.io.File; import java.nio.file.Path; @@ -38,7 +38,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class GeyserSpongeConfiguration implements IGeyserConfiguration { +public class GeyserSpongeConfiguration implements GeyserConfiguration { private File dataFolder; private ConfigurationNode node; @@ -115,6 +115,11 @@ public class GeyserSpongeConfiguration implements IGeyserConfiguration { return Paths.get(dataFolder.toString(), node.getNode("floodgate-key-file").getString("public-key.pem")); } + @Override + public boolean isCacheChunks() { + return node.getNode("cache-chunks").getBoolean(false); + } + @Override public SpongeMetricsInfo getMetrics() { return metricsInfo; diff --git a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeLogger.java b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeLogger.java index 758ac98d3..fb7cb54bb 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeLogger.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeLogger.java @@ -27,11 +27,11 @@ package org.geysermc.platform.sponge; import lombok.AllArgsConstructor; -import org.geysermc.common.logger.IGeyserLogger; +import org.geysermc.connector.GeyserLogger; import org.slf4j.Logger; @AllArgsConstructor -public class GeyserSpongeLogger implements IGeyserLogger { +public class GeyserSpongeLogger implements GeyserLogger { private Logger logger; private boolean debugMode; diff --git a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java index 88996fd2b..57470e283 100644 --- a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java +++ b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java @@ -31,8 +31,7 @@ import ninja.leaping.configurate.loader.ConfigurationLoader; import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; import org.geysermc.common.PlatformType; -import org.geysermc.common.bootstrap.IGeyserBootstrap; -import org.geysermc.common.command.ICommandManager; +import org.geysermc.connector.bootstrap.GeyserBootstrap; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.command.CommandManager; import org.geysermc.connector.utils.FileUtils; @@ -51,7 +50,7 @@ import java.io.IOException; import java.util.UUID; @Plugin(id = "geyser", name = GeyserConnector.NAME + "-Sponge", version = GeyserConnector.VERSION, url = "https://geysermc.org", authors = "GeyserMC") -public class GeyserSpongePlugin implements IGeyserBootstrap { +public class GeyserSpongePlugin implements GeyserBootstrap { @Inject private Logger logger; diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml index 0a583fa7c..770ca1009 100644 --- a/bootstrap/standalone/pom.xml +++ b/bootstrap/standalone/pom.xml @@ -81,7 +81,7 @@ - org.geysermc.platform.standalone.GeyserBootstrap + org.geysermc.platform.standalone.GeyserStandaloneBootstrap @@ -119,7 +119,7 @@ - org.geysermc.platform.standalone.GeyserBootstrap + org.geysermc.platform.standalone.GeyserStandaloneBootstrap true diff --git a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneBootstrap.java similarity index 87% rename from bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java rename to bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneBootstrap.java index 20b7f5ea7..9d2493635 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneBootstrap.java @@ -26,38 +26,38 @@ package org.geysermc.platform.standalone; import org.geysermc.common.PlatformType; -import org.geysermc.common.bootstrap.IGeyserBootstrap; +import org.geysermc.connector.GeyserConfiguration; +import org.geysermc.connector.bootstrap.GeyserBootstrap; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.command.CommandManager; import org.geysermc.connector.utils.FileUtils; import org.geysermc.platform.standalone.command.GeyserCommandManager; -import org.geysermc.platform.standalone.console.GeyserLogger; import java.io.File; import java.io.IOException; import java.util.UUID; -public class GeyserBootstrap implements IGeyserBootstrap { +public class GeyserStandaloneBootstrap implements GeyserBootstrap { private GeyserCommandManager geyserCommandManager; private GeyserConfiguration geyserConfig; - private GeyserLogger geyserLogger; + private GeyserStandaloneLogger geyserLogger; private GeyserConnector connector; public static void main(String[] args) { - new GeyserBootstrap().onEnable(); + new GeyserStandaloneBootstrap().onEnable(); } @Override public void onEnable() { - geyserLogger = new GeyserLogger(); + geyserLogger = new GeyserStandaloneLogger(); LoopbackUtil.checkLoopback(geyserLogger); try { File configFile = FileUtils.fileOrCopiedFromResource("config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString())); - geyserConfig = FileUtils.loadConfig(configFile, GeyserConfiguration.class); + geyserConfig = FileUtils.loadConfig(configFile, GeyserStandaloneConfiguration.class); } catch (IOException ex) { geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex); System.exit(0); @@ -80,7 +80,7 @@ public class GeyserBootstrap implements IGeyserBootstrap { } @Override - public GeyserLogger getGeyserLogger() { + public GeyserStandaloneLogger getGeyserLogger() { return geyserLogger; } diff --git a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserConfiguration.java b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneConfiguration.java similarity index 94% rename from bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserConfiguration.java rename to bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneConfiguration.java index afd6179e8..8ae83d026 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserConfiguration.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneConfiguration.java @@ -29,8 +29,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; - -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import java.nio.file.Path; import java.nio.file.Paths; @@ -38,7 +37,7 @@ import java.util.Map; @JsonIgnoreProperties(ignoreUnknown = true) @Getter -public class GeyserConfiguration implements IGeyserConfiguration { +public class GeyserStandaloneConfiguration implements GeyserConfiguration { private BedrockConfiguration bedrock; private RemoteConfiguration remote; @@ -66,6 +65,9 @@ public class GeyserConfiguration implements IGeyserConfiguration { @JsonProperty("default-locale") private String defaultLocale; + @JsonProperty("cache-chunks") + private boolean cacheChunks; + private MetricsInfo metrics; @Override diff --git a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/console/GeyserLogger.java b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneLogger.java similarity index 64% rename from bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/console/GeyserLogger.java rename to bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneLogger.java index 631de9052..ffb252b2e 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/console/GeyserLogger.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneLogger.java @@ -1,29 +1,30 @@ /* * Copyright (c) 2019-2020 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: + * 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 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. + * 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 * - * @author GeyserMC - * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.platform.standalone.console; +package org.geysermc.platform.standalone; import lombok.extern.log4j.Log4j2; @@ -31,12 +32,11 @@ import net.minecrell.terminalconsole.SimpleTerminalConsole; import org.apache.logging.log4j.core.config.Configurator; import org.geysermc.common.ChatColor; -import org.geysermc.common.logger.IGeyserLogger; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.command.CommandSender; @Log4j2 -public class GeyserLogger extends SimpleTerminalConsole implements IGeyserLogger, CommandSender { +public class GeyserStandaloneLogger extends SimpleTerminalConsole implements org.geysermc.connector.GeyserLogger, CommandSender { private boolean colored = true; diff --git a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java index 20a810726..03c49705d 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java @@ -6,14 +6,13 @@ import java.nio.file.OpenOption; import java.nio.file.Paths; import org.geysermc.common.ChatColor; -import org.geysermc.platform.standalone.console.GeyserLogger; public class LoopbackUtil { private static final String checkExemption = "powershell -Command \"CheckNetIsolation LoopbackExempt -s\""; // Java's Exec feature runs as CMD, NetIsolation is only accessible from PowerShell. private static final String loopbackCommand = "powershell -Command \"CheckNetIsolation LoopbackExempt -a -n='Microsoft.MinecraftUWP_8wekyb3d8bbwe'\""; private static final String startScript = "powershell -Command \"Start-Process 'cmd' -ArgumentList /c,%temp%/loopback_minecraft.bat -Verb runAs\""; - public static void checkLoopback(GeyserLogger geyserLogger) { + public static void checkLoopback(GeyserStandaloneLogger geyserLogger) { if (System.getProperty("os.name").equalsIgnoreCase("Windows 10")) { try { Process process = Runtime.getRuntime().exec(checkExemption); diff --git a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityConfiguration.java b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityConfiguration.java index 920c65379..62ae20e2f 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityConfiguration.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityConfiguration.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import java.nio.file.Path; import java.nio.file.Paths; @@ -38,7 +38,7 @@ import java.util.Map; @JsonIgnoreProperties(ignoreUnknown = true) @Getter -public class GeyserVelocityConfiguration implements IGeyserConfiguration { +public class GeyserVelocityConfiguration implements GeyserConfiguration { private BedrockConfiguration bedrock; private RemoteConfiguration remote; @@ -66,6 +66,9 @@ public class GeyserVelocityConfiguration implements IGeyserConfiguration { @JsonProperty("default-locale") private String defaultLocale; + @JsonProperty("cache-chunks") + private boolean cacheChunks; + private MetricsInfo metrics; @Override diff --git a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityLogger.java b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityLogger.java index 623c6481e..a935d786c 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityLogger.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityLogger.java @@ -27,11 +27,11 @@ package org.geysermc.platform.velocity; import lombok.AllArgsConstructor; -import org.geysermc.common.logger.IGeyserLogger; +import org.geysermc.connector.GeyserLogger; import org.slf4j.Logger; @AllArgsConstructor -public class GeyserVelocityLogger implements IGeyserLogger { +public class GeyserVelocityLogger implements GeyserLogger { private Logger logger; private boolean debugMode; diff --git a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java index 160c2d522..6e721a5f5 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java @@ -34,8 +34,8 @@ import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; import com.velocitypowered.api.plugin.Plugin; import org.geysermc.common.PlatformType; -import org.geysermc.common.bootstrap.IGeyserBootstrap; import org.geysermc.connector.GeyserConnector; +import org.geysermc.connector.bootstrap.GeyserBootstrap; import org.geysermc.connector.utils.FileUtils; import org.geysermc.platform.velocity.command.GeyserVelocityCommandExecutor; import org.geysermc.platform.velocity.command.GeyserVelocityCommandManager; @@ -46,7 +46,7 @@ import java.io.IOException; import java.util.UUID; @Plugin(id = "geyser", name = GeyserConnector.NAME + "-Velocity", version = GeyserConnector.VERSION, url = "https://geysermc.org", authors = "GeyserMC") -public class GeyserVelocityPlugin implements IGeyserBootstrap { +public class GeyserVelocityPlugin implements GeyserBootstrap { @Inject private Logger logger; diff --git a/common/src/main/java/org/geysermc/common/IGeyserConfiguration.java b/common/src/main/java/org/geysermc/common/IGeyserConfiguration.java deleted file mode 100644 index 774e3394d..000000000 --- a/common/src/main/java/org/geysermc/common/IGeyserConfiguration.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2019-2020 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.common; - -import java.nio.file.Path; -import java.util.Map; - -public interface IGeyserConfiguration { - - IBedrockConfiguration getBedrock(); - - IRemoteConfiguration getRemote(); - - Map getUserAuths(); - - boolean isPingPassthrough(); - - int getMaxPlayers(); - - boolean isDebugMode(); - - int getGeneralThreadPool(); - - boolean isAllowThirdPartyCapes(); - - String getDefaultLocale(); - - Path getFloodgateKeyFile(); - - IMetricsInfo getMetrics(); - - interface IBedrockConfiguration { - - String getAddress(); - - int getPort(); - - String getMotd1(); - - String getMotd2(); - } - - interface IRemoteConfiguration { - - String getAddress(); - - int getPort(); - - String getAuthType(); - } - - interface IUserAuthenticationInfo { - String getEmail(); - - String getPassword(); - } - - interface IMetricsInfo { - - boolean isEnabled(); - - String getUniqueId(); - } -} diff --git a/common/src/main/java/org/geysermc/common/bootstrap/IGeyserBootstrap.java b/common/src/main/java/org/geysermc/common/bootstrap/IGeyserBootstrap.java deleted file mode 100644 index 5df61953f..000000000 --- a/common/src/main/java/org/geysermc/common/bootstrap/IGeyserBootstrap.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2019-2020 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.common.bootstrap; - -import org.geysermc.common.IGeyserConfiguration; -import org.geysermc.common.command.ICommandManager; -import org.geysermc.common.logger.IGeyserLogger; - -public interface IGeyserBootstrap { - - /** - * Called when the GeyserBootstrap is enabled - */ - void onEnable(); - - /** - * Called when the GeyserBootstrap is disabled - */ - void onDisable(); - - /** - * Returns the current GeyserConfig - * - * @return The current GeyserConfig - */ - IGeyserConfiguration getGeyserConfig(); - - /** - * Returns the current GeyserLogger - * - * @return The current GeyserLogger - */ - IGeyserLogger getGeyserLogger(); - - /** - * Returns the current GeyserCommandManager - * - * @return The current GeyserCommandManager - */ - ICommandManager getGeyserCommandManager(); -} diff --git a/common/src/main/java/org/geysermc/common/logger/IGeyserLogger.java b/common/src/main/java/org/geysermc/common/logger/IGeyserLogger.java deleted file mode 100644 index ad571ebbb..000000000 --- a/common/src/main/java/org/geysermc/common/logger/IGeyserLogger.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2019-2020 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.common.logger; - -public interface IGeyserLogger { - - /** - * Logs a severe message to console - * - * @param message the message to log - */ - void severe(String message); - - /** - * Logs a severe message and an exception to console - */ - void severe(String message, Throwable error); - - /** - * Logs an error message to console - * - * @param message the message to log - */ - void error(String message); - - /** - * Logs an error message and an exception to console - */ - void error(String message, Throwable error); - - /** - * Logs a warning message to console - * - * @param message the message to log - */ - void warning(String message); - - /** - * Logs an info message to console - * - * @param message the message to log - */ - void info(String message); - - /** - * Logs a debug message to console - * - * @param message the message to log - */ - void debug(String message); - - /** - * Sets if the logger should print debug messages - * - * @param debug if the logger should print debug messages - */ - void setDebug(boolean debug); -} diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConfiguration.java b/connector/src/main/java/org/geysermc/connector/GeyserConfiguration.java new file mode 100644 index 000000000..cbbd507a1 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/GeyserConfiguration.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2019-2020 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.connector; + +import java.nio.file.Path; +import java.util.Map; + +public interface GeyserConfiguration { + + IBedrockConfiguration getBedrock(); + + IRemoteConfiguration getRemote(); + + Map getUserAuths(); + + boolean isPingPassthrough(); + + int getMaxPlayers(); + + boolean isDebugMode(); + + int getGeneralThreadPool(); + + boolean isAllowThirdPartyCapes(); + + String getDefaultLocale(); + + Path getFloodgateKeyFile(); + + boolean isCacheChunks(); + + IMetricsInfo getMetrics(); + + interface IBedrockConfiguration { + + String getAddress(); + + int getPort(); + + String getMotd1(); + + String getMotd2(); + } + + interface IRemoteConfiguration { + + String getAddress(); + + int getPort(); + + String getAuthType(); + } + + interface IUserAuthenticationInfo { + String getEmail(); + + String getPassword(); + } + + interface IMetricsInfo { + + boolean isEnabled(); + + String getUniqueId(); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java index 2679857c4..6c9e8c7db 100644 --- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java +++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java @@ -32,16 +32,15 @@ import com.nukkitx.protocol.bedrock.v390.Bedrock_v390; import lombok.Getter; import org.geysermc.common.AuthType; -import org.geysermc.common.IGeyserConfiguration; import org.geysermc.common.PlatformType; -import org.geysermc.common.bootstrap.IGeyserBootstrap; -import org.geysermc.common.logger.IGeyserLogger; +import org.geysermc.connector.bootstrap.GeyserBootstrap; import org.geysermc.connector.command.CommandManager; import org.geysermc.connector.metrics.Metrics; import org.geysermc.connector.network.ConnectorServerEventHandler; import org.geysermc.connector.network.remote.RemoteServer; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.Translators; +import org.geysermc.connector.network.translators.world.WorldManager; import org.geysermc.connector.thread.PingPassthroughThread; import org.geysermc.connector.utils.Toolbox; @@ -76,19 +75,19 @@ public class GeyserConnector { private BedrockServer bedrockServer; private PlatformType platformType; - private IGeyserBootstrap bootstrap; + private GeyserBootstrap bootstrap; private Metrics metrics; - private GeyserConnector(PlatformType platformType, IGeyserBootstrap bootstrap) { + private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) { long startupTime = System.currentTimeMillis(); instance = this; this.bootstrap = bootstrap; - IGeyserLogger logger = bootstrap.getGeyserLogger(); - IGeyserConfiguration config = bootstrap.getGeyserConfig(); + GeyserLogger logger = bootstrap.getGeyserLogger(); + GeyserConfiguration config = bootstrap.getGeyserConfig(); this.platformType = platformType; @@ -191,7 +190,7 @@ public class GeyserConnector { players.remove(player.getSocketAddress()); } - public static GeyserConnector start(PlatformType platformType, IGeyserBootstrap bootstrap) { + public static GeyserConnector start(PlatformType platformType, GeyserBootstrap bootstrap) { return new GeyserConnector(platformType, bootstrap); } @@ -200,16 +199,20 @@ public class GeyserConnector { bootstrap.onEnable(); } - public IGeyserLogger getLogger() { + public GeyserLogger getLogger() { return bootstrap.getGeyserLogger(); } - public IGeyserConfiguration getConfig() { + public GeyserConfiguration getConfig() { return bootstrap.getGeyserConfig(); } public CommandManager getCommandManager() { - return (CommandManager) bootstrap.getGeyserCommandManager(); + return bootstrap.getGeyserCommandManager(); + } + + public WorldManager getWorldManager() { + return bootstrap.getWorldManager(); } public static GeyserConnector getInstance() { diff --git a/connector/src/main/java/org/geysermc/connector/GeyserLogger.java b/connector/src/main/java/org/geysermc/connector/GeyserLogger.java new file mode 100644 index 000000000..4acab2227 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/GeyserLogger.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2019-2020 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.connector; + +public interface GeyserLogger { + + /** + * Logs a severe message to console + * + * @param message the message to log + */ + void severe(String message); + + /** + * Logs a severe message and an exception to console + */ + void severe(String message, Throwable error); + + /** + * Logs an error message to console + * + * @param message the message to log + */ + void error(String message); + + /** + * Logs an error message and an exception to console + */ + void error(String message, Throwable error); + + /** + * Logs a warning message to console + * + * @param message the message to log + */ + void warning(String message); + + /** + * Logs an info message to console + * + * @param message the message to log + */ + void info(String message); + + /** + * Logs a debug message to console + * + * @param message the message to log + */ + void debug(String message); + + /** + * Sets if the logger should print debug messages + * + * @param debug if the logger should print debug messages + */ + void setDebug(boolean debug); +} diff --git a/connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java b/connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java new file mode 100644 index 000000000..24b338c87 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2019-2020 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.connector.bootstrap; + +import org.geysermc.connector.GeyserConfiguration; +import org.geysermc.connector.GeyserLogger; +import org.geysermc.connector.command.CommandManager; +import org.geysermc.connector.network.translators.world.CachedChunkManager; +import org.geysermc.connector.network.translators.world.WorldManager; + +public interface GeyserBootstrap { + + CachedChunkManager DEFAULT_CHUNK_MANAGER = new CachedChunkManager(); + + /** + * Called when the GeyserBootstrap is enabled + */ + void onEnable(); + + /** + * Called when the GeyserBootstrap is disabled + */ + void onDisable(); + + /** + * Returns the current GeyserConfiguration + * + * @return The current GeyserConfiguration + */ + GeyserConfiguration getGeyserConfig(); + + /** + * Returns the current GeyserLogger + * + * @return The current GeyserLogger + */ + GeyserLogger getGeyserLogger(); + + /** + * Returns the current CommandManager + * + * @return The current CommandManager + */ + CommandManager getGeyserCommandManager(); + + /** + * Returns the current WorldManager + * + * @return the current WorldManager + */ + default WorldManager getWorldManager() { + return DEFAULT_CHUNK_MANAGER; + } +} diff --git a/connector/src/main/java/org/geysermc/connector/command/CommandManager.java b/connector/src/main/java/org/geysermc/connector/command/CommandManager.java index 7b1b4d69b..88b9e795d 100644 --- a/connector/src/main/java/org/geysermc/connector/command/CommandManager.java +++ b/connector/src/main/java/org/geysermc/connector/command/CommandManager.java @@ -26,7 +26,7 @@ package org.geysermc.connector.command; import lombok.Getter; -import org.geysermc.common.command.ICommandManager; + import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.command.defaults.*; @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -public abstract class CommandManager implements ICommandManager { +public abstract class CommandManager { @Getter private final Map commands = Collections.synchronizedMap(new HashMap<>()); @@ -87,4 +87,12 @@ public abstract class CommandManager implements ICommandManager { cmd.execute(sender, args); } + + /** + * Returns the description of the given command + * + * @param command Command to get the description for + * @return Command description + */ + public abstract String getDescription(String command); } diff --git a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java b/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java index 5a0cac8f4..59e1d408e 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java +++ b/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java @@ -28,7 +28,7 @@ package org.geysermc.connector.entity; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.EntityData; import org.geysermc.connector.entity.type.EntityType; -import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; public class FallingBlockEntity extends Entity { diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java index 26c13a5ce..c2dad7a57 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java +++ b/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java @@ -32,7 +32,7 @@ import com.nukkitx.protocol.bedrock.data.ItemData; import com.nukkitx.protocol.bedrock.packet.MobArmorEquipmentPacket; import org.geysermc.connector.entity.type.EntityType; import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; public class LlamaEntity extends ChestedHorseEntity { diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java index a423013cb..644181ab7 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java +++ b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java @@ -32,7 +32,7 @@ import com.nukkitx.protocol.bedrock.data.EntityData; import com.nukkitx.protocol.bedrock.data.EntityFlag; import org.geysermc.connector.entity.type.EntityType; import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; public class EndermanEntity extends MonsterEntity { diff --git a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java b/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java index 60ad28d47..8810cffb4 100644 --- a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java @@ -30,7 +30,7 @@ import com.nukkitx.protocol.bedrock.BedrockPong; import com.nukkitx.protocol.bedrock.BedrockServerEventHandler; import com.nukkitx.protocol.bedrock.BedrockServerSession; -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.utils.MessageUtils; @@ -55,7 +55,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler { public BedrockPong onQuery(InetSocketAddress inetSocketAddress) { connector.getLogger().debug(inetSocketAddress + " has pinged you!"); - IGeyserConfiguration config = connector.getConfig(); + GeyserConfiguration config = connector.getConfig(); ServerStatusInfo serverInfo = connector.getPassthroughThread().getInfo(); BedrockPong pong = new BedrockPong(); @@ -101,11 +101,6 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler { if (player != null) { player.disconnect(disconnectReason.name()); connector.removePlayer(player); - - player.getEntityCache().clear(); - player.getInventoryCache().getInventories().clear(); - player.getWindowCache().getWindows().clear(); - player.getScoreboardCache().removeScoreboard(); } }); bedrockServerSession.setPacketCodec(GeyserConnector.BEDROCK_PACKET_CODEC); diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java index 7e41fca8b..2839237e3 100644 --- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java @@ -28,7 +28,7 @@ package org.geysermc.connector.network; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.*; import org.geysermc.common.AuthType; -import org.geysermc.common.IGeyserConfiguration; +import org.geysermc.connector.GeyserConfiguration; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.Registry; @@ -94,7 +94,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { private boolean couldLoginUserByName(String bedrockUsername) { if (connector.getConfig().getUserAuths() != null) { - IGeyserConfiguration.IUserAuthenticationInfo info = connector.getConfig().getUserAuths().get(bedrockUsername); + GeyserConfiguration.IUserAuthenticationInfo info = connector.getConfig().getUserAuths().get(bedrockUsername); if (info != null) { connector.getLogger().info("using stored credentials for bedrock user " + session.getAuthData().getName()); diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index fafa2bfaa..0b4a57dc2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -62,7 +62,7 @@ import org.geysermc.connector.network.session.auth.AuthData; import org.geysermc.connector.network.session.auth.BedrockClientData; import org.geysermc.connector.network.session.cache.*; import org.geysermc.connector.network.translators.Registry; -import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; import org.geysermc.connector.utils.ChunkUtils; import org.geysermc.connector.utils.LocaleUtils; import org.geysermc.connector.utils.Toolbox; @@ -337,10 +337,11 @@ public class GeyserSession implements CommandSender { } } - this.entityCache.getEntities().clear(); - this.scoreboardCache.removeScoreboard(); - this.inventoryCache.getInventories().clear(); - this.windowCache.getWindows().clear(); + this.chunkCache = null; + this.entityCache = null; + this.scoreboardCache = null; + this.inventoryCache = null; + this.windowCache = null; closed = true; } diff --git a/connector/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java b/connector/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java index bc88694d8..ac7ab06cf 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java @@ -29,34 +29,39 @@ import com.github.steveice10.mc.protocol.data.game.chunk.Chunk; import com.github.steveice10.mc.protocol.data.game.chunk.Column; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; -import com.nukkitx.protocol.bedrock.packet.LevelChunkPacket; import lombok.Getter; import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.Translators; -import org.geysermc.connector.network.translators.block.BlockTranslator; -import org.geysermc.connector.world.chunk.ChunkPosition; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.chunk.ChunkPosition; import java.util.HashMap; import java.util.Map; public class ChunkCache { - private GeyserSession session; + private boolean cache; + private final GeyserSession session; @Getter - private Map chunks; + private Map chunks = new HashMap<>(); public ChunkCache(GeyserSession session) { this.session = session; - this.chunks = new HashMap<>(); + this.cache = session.getConnector().getConfig().isCacheChunks(); } public void addToCache(Column chunk) { + if (!cache) { + return; + } ChunkPosition position = new ChunkPosition(chunk.getX(), chunk.getZ()); chunks.put(position, chunk); } public void updateBlock(Position position, BlockState block) { + if (!cache) { + return; + } ChunkPosition chunkPosition = new ChunkPosition(position.getX() >> 4, position.getZ() >> 4); if (!chunks.containsKey(chunkPosition)) return; @@ -70,6 +75,9 @@ public class ChunkCache { } public BlockState getBlockAt(Position position) { + if (!cache) { + return BlockTranslator.AIR; + } ChunkPosition chunkPosition = new ChunkPosition(position.getX() >> 4, position.getZ() >> 4); if (!chunks.containsKey(chunkPosition)) return BlockTranslator.AIR; @@ -85,24 +93,9 @@ public class ChunkCache { } public void removeChunk(ChunkPosition position) { - chunks.remove(position); - sendEmptyChunk(position, true); - } - - public void sendEmptyChunk(ChunkPosition position) { - sendEmptyChunk(position, false); - } - - public void sendEmptyChunk(ChunkPosition position, boolean force) { - if (!force && chunks.containsKey(position)) + if (!cache) { return; - - LevelChunkPacket levelChunkPacket = new LevelChunkPacket(); - levelChunkPacket.setChunkX(position.getX()); - levelChunkPacket.setChunkZ(position.getZ()); - levelChunkPacket.setCachingEnabled(false); - levelChunkPacket.setSubChunksLength(0); - levelChunkPacket.setData(Translators.EMPTY_LEVEL_CHUNK_DATA); - session.getUpstream().sendPacket(levelChunkPacket); + } + chunks.remove(position); } } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java b/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java index f0a3fd28c..96323c1bf 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java @@ -33,8 +33,8 @@ import java.util.Map; import com.github.steveice10.mc.protocol.data.game.window.WindowType; import com.nukkitx.protocol.bedrock.data.ContainerType; import org.geysermc.connector.GeyserConnector; -import org.geysermc.connector.network.translators.block.BlockTranslator; -import org.geysermc.connector.network.translators.block.entity.*; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.entity.*; import org.geysermc.connector.network.translators.inventory.*; import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater; import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater; @@ -117,7 +117,7 @@ public class Translators { } private static void registerBlockEntityTranslators() { - Reflections ref = new Reflections("org.geysermc.connector.network.translators.block.entity"); + Reflections ref = new Reflections("org.geysermc.connector.network.translators.world.block.entity"); for (Class clazz : ref.getTypesAnnotatedWith(BlockEntity.class)) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java index 43e0a5704..1c8159cfd 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java @@ -28,9 +28,7 @@ package org.geysermc.connector.network.translators.bedrock; import java.util.concurrent.TimeUnit; import com.nukkitx.protocol.bedrock.data.LevelEventType; -import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.connector.entity.Entity; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; @@ -45,7 +43,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlaye import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket; import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket; -import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; @Translator(packet = PlayerActionPacket.class) public class BedrockActionTranslator extends PacketTranslator { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java index 7eb051c50..905d7afbc 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java @@ -25,6 +25,7 @@ package org.geysermc.connector.network.translators.bedrock; +import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerPlaceBlockPacket; import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; @@ -37,8 +38,10 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlaye import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerUseItemPacket; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; +import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; import org.geysermc.connector.entity.Entity; import org.geysermc.connector.inventory.Inventory; import org.geysermc.connector.network.session.GeyserSession; @@ -47,6 +50,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.network.translators.Translators; import org.geysermc.connector.network.translators.item.ItemEntry; import org.geysermc.connector.network.translators.item.ItemTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; import org.geysermc.connector.utils.InventoryUtils; @Translator(packet = InventoryTransactionPacket.class) @@ -76,31 +80,31 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator { @@ -110,7 +108,7 @@ public class JavaChunkDataTranslator extends PacketTranslator paletteList = new ArrayList<>(); - Reflections ref = new Reflections("org.geysermc.connector.network.translators.block.entity"); + Reflections ref = new Reflections("org.geysermc.connector.network.translators.world.block.entity"); ref.getTypesAnnotatedWith(BlockEntity.class); int waterRuntimeId = -1; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BannerBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BannerBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java index 22d26cb4b..0fc9abda6 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BannerBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; @@ -32,7 +32,7 @@ import com.nukkitx.nbt.CompoundTagBuilder; import com.nukkitx.nbt.tag.IntTag; import com.nukkitx.nbt.tag.StringTag; import com.nukkitx.nbt.tag.Tag; -import org.geysermc.connector.network.translators.block.BlockStateValues; +import org.geysermc.connector.network.translators.world.block.BlockStateValues; import java.util.ArrayList; import java.util.List; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BedBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BedBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java index a8dae2532..543828e8e 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BedBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.nbt.CompoundTagBuilder; import com.nukkitx.nbt.tag.ByteTag; import com.nukkitx.nbt.tag.Tag; -import org.geysermc.connector.network.translators.block.BlockStateValues; +import org.geysermc.connector.network.translators.world.block.BlockStateValues; import java.util.ArrayList; import java.util.List; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntity.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntity.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java index 47cbbaf30..d08ab561c 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntity.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java index f28257898..4545aed53 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/CampfireBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/CampfireBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java index 11b7e8649..d91e47c27 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/CampfireBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EmptyBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EmptyBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java index e46014008..f95cb89ec 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EmptyBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EndGatewayBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EndGatewayBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java index de5868a4b..10de9d32d 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EndGatewayBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/RequiresBlockState.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/RequiresBlockState.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java index ed8e6ede9..4df7292ad 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/RequiresBlockState.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SignBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SignBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java index 74dcdd13e..0dde33077 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SignBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.block.entity; +package org.geysermc.connector.network.translators.world.block.entity; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.mc.protocol.data.message.Message; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SkullBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java similarity index 93% rename from connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SkullBlockEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java index 2380663b1..7e73c8466 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SkullBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java @@ -1,71 +1,71 @@ -/* - * Copyright (c) 2019-2020 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.connector.network.translators.block.entity; - -import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; -import com.nukkitx.nbt.CompoundTagBuilder; -import com.nukkitx.nbt.tag.ByteTag; -import com.nukkitx.nbt.tag.CompoundTag; -import com.nukkitx.nbt.tag.FloatTag; -import com.nukkitx.nbt.tag.Tag; -import org.geysermc.connector.network.translators.block.BlockStateValues; - -import java.util.ArrayList; -import java.util.List; - -@BlockEntity(name = "Skull", delay = false, regex = "skull") -public class SkullBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState { - - @Override - public boolean isBlock(BlockState blockState) { - return BlockStateValues.getSkullVariant(blockState) != -1; - } - - @Override - public List> translateTag(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag, BlockState blockState) { - List> tags = new ArrayList<>(); - byte skullVariant = BlockStateValues.getSkullVariant(blockState); - float rotation = BlockStateValues.getSkullRotation(blockState) * 22.5f; - // Just in case... - if (skullVariant == -1) skullVariant = 0; - tags.add(new FloatTag("Rotation", rotation)); - tags.add(new ByteTag("SkullType", skullVariant)); - return tags; - } - - @Override - public com.github.steveice10.opennbt.tag.builtin.CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) { - return null; - } - - @Override - public CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) { - CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder(); - tagBuilder.floatTag("Rotation", 0); - tagBuilder.byteTag("SkullType", (byte) 0); - return tagBuilder.buildRootTag(); - } -} +/* + * Copyright (c) 2019-2020 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.connector.network.translators.world.block.entity; + +import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; +import com.nukkitx.nbt.CompoundTagBuilder; +import com.nukkitx.nbt.tag.ByteTag; +import com.nukkitx.nbt.tag.CompoundTag; +import com.nukkitx.nbt.tag.FloatTag; +import com.nukkitx.nbt.tag.Tag; +import org.geysermc.connector.network.translators.world.block.BlockStateValues; + +import java.util.ArrayList; +import java.util.List; + +@BlockEntity(name = "Skull", delay = false, regex = "skull") +public class SkullBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState { + + @Override + public boolean isBlock(BlockState blockState) { + return BlockStateValues.getSkullVariant(blockState) != -1; + } + + @Override + public List> translateTag(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag, BlockState blockState) { + List> tags = new ArrayList<>(); + byte skullVariant = BlockStateValues.getSkullVariant(blockState); + float rotation = BlockStateValues.getSkullRotation(blockState) * 22.5f; + // Just in case... + if (skullVariant == -1) skullVariant = 0; + tags.add(new FloatTag("Rotation", rotation)); + tags.add(new ByteTag("SkullType", skullVariant)); + return tags; + } + + @Override + public com.github.steveice10.opennbt.tag.builtin.CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) { + return null; + } + + @Override + public CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) { + CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder(); + tagBuilder.floatTag("Rotation", 0); + tagBuilder.byteTag("SkullType", (byte) 0); + return tagBuilder.buildRootTag(); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java similarity index 68% rename from connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java index 360fdea45..5995ecf9e 100644 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java @@ -1,21 +1,37 @@ /* * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. + * 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 * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit */ -package org.geysermc.connector.world.chunk; +package org.geysermc.connector.network.translators.world.chunk; import com.nukkitx.network.VarInts; import io.netty.buffer.ByteBuf; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; -import org.geysermc.connector.world.chunk.bitarray.BitArray; -import org.geysermc.connector.world.chunk.bitarray.BitArrayVersion; +import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArray; +import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArrayVersion; import java.util.function.IntConsumer; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkPosition.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkPosition.java new file mode 100644 index 000000000..a51755d0b --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkPosition.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.world.chunk; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class ChunkPosition { + + private int x; + private int z; + + public Position getBlock(int x, int y, int z) { + return new Position((this.x << 4) + x, y, (this.z << 4) + z); + } + + public Position getChunkBlock(int x, int y, int z) { + int chunkX = x & 15; + int chunkY = y & 15; + int chunkZ = z & 15; + return new Position(chunkX, chunkY, chunkZ); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/ChunkSection.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkSection.java similarity index 77% rename from connector/src/main/java/org/geysermc/connector/world/chunk/ChunkSection.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkSection.java index c160d11b3..4ede0c255 100644 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/ChunkSection.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/ChunkSection.java @@ -1,14 +1,30 @@ /* * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. + * 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 * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit */ -package org.geysermc.connector.world.chunk; +package org.geysermc.connector.network.translators.world.chunk; import com.nukkitx.network.util.Preconditions; import io.netty.buffer.ByteBuf; diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/NibbleArray.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java similarity index 62% rename from connector/src/main/java/org/geysermc/connector/world/chunk/NibbleArray.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java index 8da068f75..08303e189 100644 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/NibbleArray.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java @@ -1,14 +1,30 @@ /* * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. + * 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 * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit */ -package org.geysermc.connector.world.chunk; +package org.geysermc.connector.network.translators.world.chunk; import com.nukkitx.network.util.Preconditions; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java new file mode 100644 index 000000000..728fe237e --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.world.chunk.bitarray; + +public interface BitArray { + + void set(int index, int value); + + int get(int index); + + int size(); + + int[] getWords(); + + BitArrayVersion getVersion(); + + BitArray copy(); +} \ No newline at end of file diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArrayVersion.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java similarity index 60% rename from connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArrayVersion.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java index f6e3ef5e5..be91f13d8 100644 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArrayVersion.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java @@ -1,14 +1,30 @@ /* * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. + * 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 * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit */ -package org.geysermc.connector.world.chunk.bitarray; +package org.geysermc.connector.network.translators.world.chunk.bitarray; import org.geysermc.connector.utils.MathUtils; diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/PaddedBitArray.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java similarity index 65% rename from connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/PaddedBitArray.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java index d2f9393a3..36a97a30c 100644 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/PaddedBitArray.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java @@ -1,14 +1,30 @@ /* * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. + * 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 * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit */ -package org.geysermc.connector.world.chunk.bitarray; +package org.geysermc.connector.network.translators.world.chunk.bitarray; import com.nukkitx.network.util.Preconditions; import org.geysermc.connector.utils.MathUtils; diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/Pow2BitArray.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java similarity index 67% rename from connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/Pow2BitArray.java rename to connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java index bcb878a70..c9bd27646 100644 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/Pow2BitArray.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java @@ -1,14 +1,30 @@ /* * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. + * 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 * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit */ -package org.geysermc.connector.world.chunk.bitarray; +package org.geysermc.connector.network.translators.world.chunk.bitarray; import com.nukkitx.network.util.Preconditions; import org.geysermc.connector.utils.MathUtils; diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java b/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java index 0dcd13ad9..2c04c205b 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java @@ -6,7 +6,7 @@ import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.Translators; -import org.geysermc.connector.network.translators.block.entity.BlockEntityTranslator; +import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator; public class BlockEntityUtils { diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockUtils.java b/connector/src/main/java/org/geysermc/connector/utils/BlockUtils.java index 34287073e..3a9ecb867 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/BlockUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/BlockUtils.java @@ -28,7 +28,7 @@ package org.geysermc.connector.utils; import com.github.steveice10.mc.protocol.data.game.entity.Effect; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import org.geysermc.connector.entity.PlayerEntity; -import org.geysermc.connector.network.translators.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; import org.geysermc.connector.network.translators.item.ItemEntry; import org.geysermc.connector.network.translators.item.ToolItemEntry; diff --git a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java index d496215ac..3a3d11829 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java @@ -42,16 +42,16 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import lombok.Getter; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.block.entity.*; +import org.geysermc.connector.network.translators.world.block.entity.*; import org.geysermc.connector.network.translators.Translators; -import org.geysermc.connector.network.translators.block.BlockTranslator; -import org.geysermc.connector.world.chunk.ChunkPosition; -import org.geysermc.connector.world.chunk.ChunkSection; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; +import org.geysermc.connector.network.translators.world.chunk.ChunkPosition; +import org.geysermc.connector.network.translators.world.chunk.ChunkSection; import java.util.HashMap; import java.util.Map; -import static org.geysermc.connector.network.translators.block.BlockTranslator.BEDROCK_WATER_ID; +import static org.geysermc.connector.network.translators.world.block.BlockTranslator.BEDROCK_WATER_ID; public class ChunkUtils { @@ -181,6 +181,7 @@ public class ChunkUtils { } } } + session.getChunkCache().updateBlock(new Position(position.getX(), position.getY(), position.getZ()), blockState); } public static void sendEmptyChunks(GeyserSession session, Vector3i position, int radius, boolean forceUpdate) { diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/ChunkPosition.java b/connector/src/main/java/org/geysermc/connector/world/chunk/ChunkPosition.java deleted file mode 100644 index c45a7c942..000000000 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/ChunkPosition.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2019-2020 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.connector.world.chunk; - -import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ChunkPosition { - - private int x; - private int z; - - public Position getBlock(int x, int y, int z) { - return new Position((this.x << 4) + x, y, (this.z << 4) + z); - } - - public Position getChunkBlock(int x, int y, int z) { - int chunkX = x & 15; - int chunkY = y & 15; - int chunkZ = z & 15; - return new Position(chunkX, chunkY, chunkZ); - } -} diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArray.java b/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArray.java deleted file mode 100644 index 944cabd3f..000000000 --- a/connector/src/main/java/org/geysermc/connector/world/chunk/bitarray/BitArray.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org - * - * This code in this file is derived from NukkitX and permission has - * been granted to us allowing the usage of it in Geyser. - * - * Copyright (C) 2020 The NukkitX Project - * https://github.com/NukkitX/Nukkit - */ - -package org.geysermc.connector.world.chunk.bitarray; - -public interface BitArray { - - void set(int index, int value); - - int get(int index); - - int size(); - - int[] getWords(); - - BitArrayVersion getVersion(); - - BitArray copy(); -} \ No newline at end of file diff --git a/connector/src/main/resources/config.yml b/connector/src/main/resources/config.yml index ae0cbed8d..b1e1e2f93 100644 --- a/connector/src/main/resources/config.yml +++ b/connector/src/main/resources/config.yml @@ -60,6 +60,15 @@ allow-third-party-capes: true # The default locale if we dont have the one the client requested default-locale: en_us +# Configures if chunk caching should be enabled or not. This keeps an individual +# record of each block the client loads in. While this feature does allow for a few +# things such as block break animations to show up in creative mode and among others, +# it is HIGHLY recommended you disable this on a production environment as it can eat +# up a lot of RAM. However, when using the Bukkit version of Geyser, support for features +# or implementations this allows is automatically enabled without the additional caching as +# Geyser has direct access to the server itself. +cache-chunks: false + # bStats is a stat tracker that is entirely anonymous and tracks only basic information # about Geyser, such as how many people are online, how many servers are using Geyser, # what OS is being used, etc. You can learn more about bStats here: https://bstats.org/. From 364aac7e1a2c42a53e755cff0b43a401dc42cfbc Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Wed, 29 Apr 2020 15:47:29 -0500 Subject: [PATCH 10/22] Fix block break particles not displaying in survival --- .../bedrock/BedrockInventoryTransactionTranslator.java | 2 +- .../java/entity/player/JavaPlayerActionAckTranslator.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java index 905d7afbc..7344a8fe0 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java @@ -118,7 +118,7 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator Date: Wed, 29 Apr 2020 15:56:41 -0500 Subject: [PATCH 11/22] Access world manager instead of chunk cache to fix particles on Bukkit version --- .../bedrock/BedrockInventoryTransactionTranslator.java | 2 +- .../translators/inventory/DoubleChestInventoryTranslator.java | 4 ++-- .../translators/inventory/holder/BlockInventoryHolder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java index 7344a8fe0..80b37802c 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java @@ -116,7 +116,7 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator Date: Thu, 30 Apr 2020 00:21:02 -0500 Subject: [PATCH 12/22] Add sound handlers for block interaction These sound handlers had to be added since on Minecraft: Java Edition, these sounds are handled clientside whilst Minecraft: Bedrock Edition expects something from the server. To counter this, we emulate the sounds of that on Minecraft: Java Edition within Geyser and send it to the client. The code may seem a tadredundant, but there is not much of an alternative unfortunately. --- .../network/session/GeyserSession.java | 10 ++ .../bedrock/BedrockActionTranslator.java | 2 + ...BedrockInventoryTransactionTranslator.java | 2 + .../java/world/JavaBlockChangeTranslator.java | 33 ++++++- .../java/world/JavaPlayEffectTranslator.java | 4 +- .../sound/BucketSoundInteractionHandler.java | 72 ++++++++++++++ .../sound/DoorSoundInteractionHandler.java | 46 +++++++++ .../FlintAndSteelInteractionHandler.java | 49 +++++++++ .../sound/GrassPathInteractionHandler.java | 50 ++++++++++ .../sound/LeverSoundInteractionHandler.java | 46 +++++++++ .../translators/sound/SoundHandler.java | 66 +++++++++++++ .../sound/SoundHandlerRegistry.java | 69 +++++++++++++ .../sound/SoundInteractionHandler.java | 99 +++++++++++++++++++ connector/src/main/resources/mappings | 2 +- 14 files changed, 542 insertions(+), 8 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/BucketSoundInteractionHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/DoorSoundInteractionHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/FlintAndSteelInteractionHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/GrassPathInteractionHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/LeverSoundInteractionHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandlerRegistry.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index 70574032f..e9b0e4726 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -118,6 +118,10 @@ public class GeyserSession implements CommandSender { private GameMode gameMode = GameMode.SURVIVAL; private final AtomicInteger pendingDimSwitches = new AtomicInteger(0); + + @Setter + private boolean sneaking; + @Setter private boolean sprinting; @@ -133,6 +137,12 @@ public class GeyserSession implements CommandSender { @Setter private String lastBlockPlacedId; + @Setter + private boolean interacting; + + @Setter + private Vector3i lastInteractionPosition; + @Setter private boolean switchingDimension = false; private boolean manyDimPackets = false; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java index 1c8159cfd..d7248aa36 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java @@ -78,10 +78,12 @@ public class BedrockActionTranslator extends PacketTranslator INTERACTION_HANDLERS = new HashMap<>(); + + static { + Reflections ref = new Reflections("org.geysermc.connector.network.translators.sound"); + for (Class clazz : ref.getTypesAnnotatedWith(SoundHandler.class)) { + try { + SoundInteractionHandler interactionHandler = (SoundInteractionHandler) clazz.newInstance(); + SoundHandler annotation = clazz.getAnnotation(SoundHandler.class); + INTERACTION_HANDLERS.put(annotation, interactionHandler); + } catch (InstantiationException | IllegalAccessException ex) { + ex.printStackTrace(); + } + } + } + + private SoundHandlerRegistry() { + } + + public static void init() { + // no-op + } + + /** + * Returns a map of the interaction handlers + * + * @return a map of the interaction handlers + */ + public static Map getInteractionHandlers() { + return INTERACTION_HANDLERS; + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java new file mode 100644 index 000000000..364b93b8f --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.sound; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; +import com.nukkitx.math.vector.Vector3f; + +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.Translators; + +import java.util.Map; + +/** + * Handler for playing sounds when right-clicking + * blocks. Due to Minecraft: Bedrock Edition + * expecting interaction sounds to be played serverside + * and Minecraft: Java Edition handling them clientside, + * this had to be made to handle scenarios like that. + */ +public interface SoundInteractionHandler { + + /** + * Handles the interaction when a player + * right-clicks a block. + * + * @param session the session interacting with the block + * @param position the position of the block + * @param identifier the identifier of the block + */ + void handleInteraction(GeyserSession session, Vector3f position, String identifier); + + /** + * Handles the block interaction when a player + * right-clicks a block. + * + * @param session the session interacting with the block + * @param position the position of the block + * @param identifier the identifier of the block + */ + static void handleBlockInteraction(GeyserSession session, Vector3f position, String identifier) { + for (Map.Entry interactionEntry : SoundHandlerRegistry.INTERACTION_HANDLERS.entrySet()) { + if (interactionEntry.getKey().blocks().length != 0) { + boolean contains = false; + for (String blockIdentifier : interactionEntry.getKey().blocks()) { + if (identifier.contains(blockIdentifier)) { + contains = true; + break; + } + } + if (!contains) continue; + } + ItemStack itemInHand = session.getInventory().getItemInHand(); + if (interactionEntry.getKey().items().length != 0) { + if (itemInHand == null || itemInHand.getId() == 0) { + continue; + } + String handIdentifier = Translators.getItemTranslator().getItem(session.getInventory().getItemInHand()).getJavaIdentifier(); + boolean contains = false; + for (String itemIdentifier : interactionEntry.getKey().items()) { + if (handIdentifier.contains(itemIdentifier)) { + contains = true; + break; + } + } + if (!contains) continue; + } + if (session.isSneaking() && !interactionEntry.getKey().ignoreSneakingWhileHolding()) { + if (session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() != 0) { + continue; + } + } + interactionEntry.getValue().handleInteraction(session, position, identifier); + } + } +} diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index 4d53e24f9..e28b12703 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit 4d53e24f92d20e51909ee48ac28ed17f92cb819e +Subproject commit e28b127030a81330d9fabef30efda8cbfdf4e5e3 From 0ac4789f2c00280acace07a64388aa1b47847720 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Thu, 30 Apr 2020 00:45:27 -0500 Subject: [PATCH 13/22] Don't send sound updates if block of the same type already exists in placing position This prevents the block place sound (most notably buttons or blocks that don't occupy one whole block) from spamming the client if they have their place button held down. --- .../translators/java/world/JavaBlockChangeTranslator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java index 600c4da47..2313a1368 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java @@ -25,6 +25,7 @@ package org.geysermc.connector.network.translators.java.world; +import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; @@ -42,9 +43,13 @@ public class JavaBlockChangeTranslator extends PacketTranslator Date: Thu, 30 Apr 2020 00:53:28 -0500 Subject: [PATCH 14/22] Don't show block break animation at all in creative --- .../java/entity/player/JavaPlayerActionAckTranslator.java | 3 +++ .../src/main/java/org/geysermc/connector/utils/Toolbox.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java index 773dec753..d62017c62 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java @@ -61,6 +61,9 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator Date: Sat, 2 May 2020 01:06:22 -0500 Subject: [PATCH 15/22] Start work on entity sounds, other misc implementations/fixes --- ...BedrockInventoryTransactionTranslator.java | 3 + .../java/world/JavaBlockChangeTranslator.java | 4 +- .../java/world/JavaPlayEffectTranslator.java | 10 +++ .../sound/BlockSoundInteractionHandler.java | 87 ++++++++++++++++++ .../sound/EntitySoundInteractionHandler.java | 88 +++++++++++++++++++ .../translators/sound/SoundHandler.java | 20 ++++- .../sound/SoundHandlerRegistry.java | 6 +- .../sound/SoundInteractionHandler.java | 58 ++---------- .../BucketSoundInteractionHandler.java | 7 +- .../DoorSoundInteractionHandler.java | 7 +- .../FlintAndSteelInteractionHandler.java | 7 +- .../GrassPathInteractionHandler.java | 7 +- .../sound/block/HoeInteractionHandler.java | 51 +++++++++++ .../LeverSoundInteractionHandler.java | 6 +- .../MilkCowSoundInteractionHandler.java | 55 ++++++++++++ connector/src/main/resources/mappings | 2 +- 16 files changed, 342 insertions(+), 76 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java rename connector/src/main/java/org/geysermc/connector/network/translators/sound/{ => block}/BucketSoundInteractionHandler.java (90%) rename connector/src/main/java/org/geysermc/connector/network/translators/sound/{ => block}/DoorSoundInteractionHandler.java (86%) rename connector/src/main/java/org/geysermc/connector/network/translators/sound/{ => block}/FlintAndSteelInteractionHandler.java (87%) rename connector/src/main/java/org/geysermc/connector/network/translators/sound/{ => block}/GrassPathInteractionHandler.java (88%) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java rename connector/src/main/java/org/geysermc/connector/network/translators/sound/{ => block}/LeverSoundInteractionHandler.java (86%) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkCowSoundInteractionHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java index 373132c98..602e4edaf 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java @@ -50,6 +50,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.network.translators.Translators; import org.geysermc.connector.network.translators.item.ItemEntry; import org.geysermc.connector.network.translators.item.ItemTranslator; +import org.geysermc.connector.network.translators.sound.EntitySoundInteractionHandler; import org.geysermc.connector.network.translators.world.block.BlockTranslator; import org.geysermc.connector.utils.InventoryUtils; @@ -160,6 +161,8 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator { + + /** + * Handles the block interaction when a player + * right-clicks a block. + * + * @param session the session interacting with the block + * @param position the position of the block + * @param identifier the identifier of the block + */ + static void handleBlockInteraction(GeyserSession session, Vector3f position, String identifier) { + for (Map.Entry> interactionEntry : SoundHandlerRegistry.INTERACTION_HANDLERS.entrySet()) { + if (!(interactionEntry.getValue() instanceof BlockSoundInteractionHandler)) { + continue; + } + if (interactionEntry.getKey().blocks().length != 0) { + boolean contains = false; + for (String blockIdentifier : interactionEntry.getKey().blocks()) { + if (identifier.contains(blockIdentifier)) { + contains = true; + break; + } + } + if (!contains) continue; + } + ItemStack itemInHand = session.getInventory().getItemInHand(); + if (interactionEntry.getKey().items().length != 0) { + if (itemInHand == null || itemInHand.getId() == 0) { + continue; + } + String handIdentifier = Translators.getItemTranslator().getItem(session.getInventory().getItemInHand()).getJavaIdentifier(); + boolean contains = false; + for (String itemIdentifier : interactionEntry.getKey().items()) { + if (handIdentifier.contains(itemIdentifier)) { + contains = true; + break; + } + } + if (!contains) continue; + } + if (session.isSneaking() && !interactionEntry.getKey().ignoreSneakingWhileHolding()) { + if (session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() != 0) { + continue; + } + } + ((BlockSoundInteractionHandler) interactionEntry.getValue()).handleInteraction(session, position, identifier); + } + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java new file mode 100644 index 000000000..3e0626908 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.sound; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; +import com.nukkitx.math.vector.Vector3f; +import org.geysermc.connector.entity.Entity; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.Translators; + +import java.util.Map; + +/** + * Sound interaction handler for when an entity is right-clicked. + */ +public interface EntitySoundInteractionHandler extends SoundInteractionHandler { + + /** + * Handles the block interaction when a player + * right-clicks an entity. + * + * @param session the session interacting with the block + * @param position the position of the block + * @param entity the entity interacted with + */ + static void handleEntityInteraction(GeyserSession session, Vector3f position, Entity entity) { + for (Map.Entry> interactionEntry : SoundHandlerRegistry.INTERACTION_HANDLERS.entrySet()) { + if (!(interactionEntry.getValue() instanceof EntitySoundInteractionHandler)) { + continue; + } + if (interactionEntry.getKey().entities().length != 0) { + boolean contains = false; + for (String entityIdentifier : interactionEntry.getKey().entities()) { + if (entity.getEntityType().name().toLowerCase().contains(entityIdentifier)) { + contains = true; + break; + } + } + if (!contains) continue; + } + ItemStack itemInHand = session.getInventory().getItemInHand(); + if (interactionEntry.getKey().items().length != 0) { + if (itemInHand == null || itemInHand.getId() == 0) { + continue; + } + String handIdentifier = Translators.getItemTranslator().getItem(session.getInventory().getItemInHand()).getJavaIdentifier(); + boolean contains = false; + for (String itemIdentifier : interactionEntry.getKey().items()) { + if (handIdentifier.contains(itemIdentifier)) { + contains = true; + break; + } + } + if (!contains) continue; + } + if (session.isSneaking() && !interactionEntry.getKey().ignoreSneakingWhileHolding()) { + if (session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() != 0) { + continue; + } + } + ((EntitySoundInteractionHandler) interactionEntry.getValue()).handleInteraction(session, position, entity); + } + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java index 0f22e2ac3..52a76aa3b 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java @@ -38,8 +38,10 @@ public @interface SoundHandler { /** * The identifier(s) that the placed block must contain - * one of. - * Leave empty to ignore. + * one of. Leave empty to ignore. + * + * Only applies to interaction handlers that are an + * instance of {@link BlockSoundInteractionHandler}. * * @return the value the interacted block must contain */ @@ -47,13 +49,23 @@ public @interface SoundHandler { /** * The identifier(s) that the player's hand item - * must contain one of. - * Leave empty to ignore. + * must contain one of. Leave empty to ignore. * * @return the value the item in the player's hand must contain */ String[] items() default {}; + /** + * The identifier(s) that the interacted entity must have. + * Leave empty to ignore. + * + * Only applies to interaction handlers that are an + * instance of {@link BlockSoundInteractionHandler}. + * + * @return the value the item in the player's hand must contain + */ + String[] entities() default {}; + /** * Controls if the interaction should still be * called even if the player is sneaking while diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandlerRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandlerRegistry.java index d5187f643..260efb416 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandlerRegistry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandlerRegistry.java @@ -36,13 +36,13 @@ import java.util.Map; */ public class SoundHandlerRegistry { - static final Map INTERACTION_HANDLERS = new HashMap<>(); + static final Map> INTERACTION_HANDLERS = new HashMap<>(); static { Reflections ref = new Reflections("org.geysermc.connector.network.translators.sound"); for (Class clazz : ref.getTypesAnnotatedWith(SoundHandler.class)) { try { - SoundInteractionHandler interactionHandler = (SoundInteractionHandler) clazz.newInstance(); + SoundInteractionHandler interactionHandler = (SoundInteractionHandler) clazz.newInstance(); SoundHandler annotation = clazz.getAnnotation(SoundHandler.class); INTERACTION_HANDLERS.put(annotation, interactionHandler); } catch (InstantiationException | IllegalAccessException ex) { @@ -63,7 +63,7 @@ public class SoundHandlerRegistry { * * @return a map of the interaction handlers */ - public static Map getInteractionHandlers() { + public static Map> getInteractionHandlers() { return INTERACTION_HANDLERS; } } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java index 364b93b8f..e68061ef4 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java @@ -26,22 +26,20 @@ package org.geysermc.connector.network.translators.sound; -import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.nukkitx.math.vector.Vector3f; import org.geysermc.connector.network.session.GeyserSession; -import org.geysermc.connector.network.translators.Translators; - -import java.util.Map; /** * Handler for playing sounds when right-clicking - * blocks. Due to Minecraft: Bedrock Edition + * various objects. Due to Minecraft: Bedrock Edition * expecting interaction sounds to be played serverside * and Minecraft: Java Edition handling them clientside, * this had to be made to handle scenarios like that. + * + * @param the value */ -public interface SoundInteractionHandler { +public interface SoundInteractionHandler { /** * Handles the interaction when a player @@ -49,51 +47,7 @@ public interface SoundInteractionHandler { * * @param session the session interacting with the block * @param position the position of the block - * @param identifier the identifier of the block + * @param value the value */ - void handleInteraction(GeyserSession session, Vector3f position, String identifier); - - /** - * Handles the block interaction when a player - * right-clicks a block. - * - * @param session the session interacting with the block - * @param position the position of the block - * @param identifier the identifier of the block - */ - static void handleBlockInteraction(GeyserSession session, Vector3f position, String identifier) { - for (Map.Entry interactionEntry : SoundHandlerRegistry.INTERACTION_HANDLERS.entrySet()) { - if (interactionEntry.getKey().blocks().length != 0) { - boolean contains = false; - for (String blockIdentifier : interactionEntry.getKey().blocks()) { - if (identifier.contains(blockIdentifier)) { - contains = true; - break; - } - } - if (!contains) continue; - } - ItemStack itemInHand = session.getInventory().getItemInHand(); - if (interactionEntry.getKey().items().length != 0) { - if (itemInHand == null || itemInHand.getId() == 0) { - continue; - } - String handIdentifier = Translators.getItemTranslator().getItem(session.getInventory().getItemInHand()).getJavaIdentifier(); - boolean contains = false; - for (String itemIdentifier : interactionEntry.getKey().items()) { - if (handIdentifier.contains(itemIdentifier)) { - contains = true; - break; - } - } - if (!contains) continue; - } - if (session.isSneaking() && !interactionEntry.getKey().ignoreSneakingWhileHolding()) { - if (session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() != 0) { - continue; - } - } - interactionEntry.getValue().handleInteraction(session, position, identifier); - } - } + void handleInteraction(GeyserSession session, Vector3f position, T value); } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/BucketSoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java similarity index 90% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/BucketSoundInteractionHandler.java rename to connector/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java index 4a79d1af0..00269cc7f 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/BucketSoundInteractionHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java @@ -24,17 +24,18 @@ * */ -package org.geysermc.connector.network.translators.sound; +package org.geysermc.connector.network.translators.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; - import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.Translators; +import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; @SoundHandler(items = "bucket") -public class BucketSoundInteractionHandler implements SoundInteractionHandler { +public class BucketSoundInteractionHandler implements BlockSoundInteractionHandler { @Override public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/DoorSoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java similarity index 86% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/DoorSoundInteractionHandler.java rename to connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java index c547292f9..3cf5955f5 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/DoorSoundInteractionHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java @@ -24,16 +24,17 @@ * */ -package org.geysermc.connector.network.translators.sound; +package org.geysermc.connector.network.translators.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; - import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; @SoundHandler(blocks = "door") -public class DoorSoundInteractionHandler implements SoundInteractionHandler { +public class DoorSoundInteractionHandler implements BlockSoundInteractionHandler { @Override public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/FlintAndSteelInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java similarity index 87% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/FlintAndSteelInteractionHandler.java rename to connector/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java index 2a03f4af9..b28133b34 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/FlintAndSteelInteractionHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java @@ -24,16 +24,17 @@ * */ -package org.geysermc.connector.network.translators.sound; +package org.geysermc.connector.network.translators.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; - import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; @SoundHandler(items = "flint_and_steel", ignoreSneakingWhileHolding = true) -public class FlintAndSteelInteractionHandler implements SoundInteractionHandler { +public class FlintAndSteelInteractionHandler implements BlockSoundInteractionHandler { @Override public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/GrassPathInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java similarity index 88% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/GrassPathInteractionHandler.java rename to connector/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java index 10d1df91a..e29571036 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/GrassPathInteractionHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java @@ -24,17 +24,18 @@ * */ -package org.geysermc.connector.network.translators.sound; +package org.geysermc.connector.network.translators.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; - import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; import org.geysermc.connector.network.translators.world.block.BlockTranslator; @SoundHandler(blocks = "grass_path", items = "shovel", ignoreSneakingWhileHolding = true) -public class GrassPathInteractionHandler implements SoundInteractionHandler { +public class GrassPathInteractionHandler implements BlockSoundInteractionHandler { @Override public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java new file mode 100644 index 000000000..c9d4299b4 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.sound.block; + +import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.data.SoundEvent; +import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; + +@SoundHandler(blocks = "farmland", items = "hoe", ignoreSneakingWhileHolding = true) +public class HoeInteractionHandler implements BlockSoundInteractionHandler { + + @Override + public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { + LevelSoundEventPacket levelSoundEventPacket = new LevelSoundEventPacket(); + levelSoundEventPacket.setPosition(position); + levelSoundEventPacket.setBabySound(false); + levelSoundEventPacket.setRelativeVolumeDisabled(false); + levelSoundEventPacket.setIdentifier(":"); + levelSoundEventPacket.setSound(SoundEvent.ITEM_USE_ON); + levelSoundEventPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaBlockState(identifier))); + session.getUpstream().sendPacket(levelSoundEventPacket); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/LeverSoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java similarity index 86% rename from connector/src/main/java/org/geysermc/connector/network/translators/sound/LeverSoundInteractionHandler.java rename to connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java index 0c3b69c5f..0175f9277 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/LeverSoundInteractionHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java @@ -24,15 +24,17 @@ * */ -package org.geysermc.connector.network.translators.sound; +package org.geysermc.connector.network.translators.sound.block; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.data.LevelEventType; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; @SoundHandler(blocks = "lever") -public class LeverSoundInteractionHandler implements SoundInteractionHandler { +public class LeverSoundInteractionHandler implements BlockSoundInteractionHandler { @Override public void handleInteraction(GeyserSession session, Vector3f position, String identifier) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkCowSoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkCowSoundInteractionHandler.java new file mode 100644 index 000000000..d4046eea7 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkCowSoundInteractionHandler.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.sound.entity; + +import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.data.SoundEvent; +import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; +import org.geysermc.connector.entity.Entity; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.Translators; +import org.geysermc.connector.network.translators.sound.EntitySoundInteractionHandler; +import org.geysermc.connector.network.translators.sound.SoundHandler; + +@SoundHandler(entities = "cow", items = "bucket") +public class MilkCowSoundInteractionHandler implements EntitySoundInteractionHandler { + + @Override + public void handleInteraction(GeyserSession session, Vector3f position, Entity value) { + if (!Translators.getItemTranslator().getItem(session.getInventory().getItemInHand()).getJavaIdentifier().equals("minecraft:bucket")) { + return; + } + LevelSoundEventPacket levelSoundEventPacket = new LevelSoundEventPacket(); + levelSoundEventPacket.setPosition(position); + levelSoundEventPacket.setBabySound(false); + levelSoundEventPacket.setRelativeVolumeDisabled(false); + levelSoundEventPacket.setIdentifier(":"); + levelSoundEventPacket.setSound(SoundEvent.MILK); + levelSoundEventPacket.setExtraData(-1); + session.getUpstream().sendPacket(levelSoundEventPacket); + } +} diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index e28b12703..9d801ea70 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit e28b127030a81330d9fabef30efda8cbfdf4e5e3 +Subproject commit 9d801ea70edf1ae36f38b91a5c17bf2245315a68 From 99e8ca83ab1176b3cdc2f5b2bfd75ed05cd5de05 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sat, 2 May 2020 01:29:30 -0500 Subject: [PATCH 16/22] Fix eating sounds and bow sounds --- .../bedrock/BedrockEntityEventTranslator.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityEventTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityEventTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityEventTranslator.java new file mode 100644 index 000000000..6e8b86c46 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityEventTranslator.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.bedrock; + +import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; + +@Translator(packet = EntityEventPacket.class) +public class BedrockEntityEventTranslator extends PacketTranslator { + + @Override + public void translate(EntityEventPacket packet, GeyserSession session) { + switch (packet.getType()) { + // Resend the packet so we get the eating sounds + case EATING_ITEM: + session.getUpstream().sendPacket(packet); + return; + } + session.getConnector().getLogger().debug("Did not translate incoming EntityEventPacket: " + packet.toString()); + } +} From d7592d8216f8701bd017e7ff572237903773080a Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sat, 2 May 2020 01:56:08 -0500 Subject: [PATCH 17/22] Add back in explosion translator, add identifier support for sounds Some sounds require an identifier be added, otherwise they don't properly play. --- .../java/world/JavaExplosionTranslator.java | 47 +++++++++++++++++++ .../world/JavaPlayBuiltinSoundTranslator.java | 2 +- .../java/world/JavaPlayEffectTranslator.java | 2 +- .../geysermc/connector/utils/SoundUtils.java | 7 ++- connector/src/main/resources/mappings | 2 +- 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java new file mode 100644 index 000000000..aabf4b645 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019-2020 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.connector.network.translators.java.world; + +import com.github.steveice10.mc.protocol.data.game.world.block.ExplodedBlockRecord; +import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerExplosionPacket; +import com.nukkitx.math.vector.Vector3i; +import org.geysermc.connector.network.session.GeyserSession; +import org.geysermc.connector.network.translators.PacketTranslator; +import org.geysermc.connector.network.translators.Translator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; +import org.geysermc.connector.utils.ChunkUtils; + +@Translator(packet = ServerExplosionPacket.class) +public class JavaExplosionTranslator extends PacketTranslator { + + @Override + public void translate(ServerExplosionPacket packet, GeyserSession session) { + for (ExplodedBlockRecord record : packet.getExploded()) { + ChunkUtils.updateBlock(session, BlockTranslator.AIR, Vector3i.from(record.getX(), record.getY(), record.getZ())); + } + } +} diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java index e6bbd7cdc..b797eb800 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java @@ -77,7 +77,7 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator Date: Sun, 3 May 2020 01:48:38 -0500 Subject: [PATCH 18/22] Add tnt sounds/particles and support for level event sounds --- .../geysermc/connector/entity/TNTEntity.java | 65 +++++++++++++++++++ .../connector/entity/type/EntityType.java | 2 +- .../java/world/JavaExplosionTranslator.java | 22 ++++++- .../world/JavaPlayBuiltinSoundTranslator.java | 10 +++ .../geysermc/connector/utils/SoundUtils.java | 7 +- connector/src/main/resources/mappings | 2 +- 6 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java b/connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java new file mode 100644 index 000000000..629c9e51c --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/entity/TNTEntity.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2019-2020 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.connector.entity; + +import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; +import com.nukkitx.math.vector.Vector3f; +import com.nukkitx.protocol.bedrock.data.EntityData; +import com.nukkitx.protocol.bedrock.data.EntityFlag; +import org.geysermc.connector.entity.type.EntityType; +import org.geysermc.connector.network.session.GeyserSession; + +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +public class TNTEntity extends Entity { + + private int currentTick; + + public TNTEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) { + super(entityId, geyserId, entityType, position, motion, rotation); + } + + @Override + public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { + if (entityMetadata.getId() == 7) { + currentTick = (int) entityMetadata.getValue(); + metadata.getFlags().setFlag(EntityFlag.IGNITED, true); + metadata.put(EntityData.FUSE_LENGTH, currentTick); + ScheduledFuture future = session.getConnector().getGeneralThreadPool().scheduleAtFixedRate(() -> { + if (currentTick % 5 == 0) { + metadata.put(EntityData.FUSE_LENGTH, currentTick); + } + currentTick--; + super.updateBedrockMetadata(entityMetadata, session); + }, 50, 50, TimeUnit.MILLISECONDS); // 5 ticks + session.getConnector().getGeneralThreadPool().schedule(() -> future.cancel(true), (int) entityMetadata.getValue() / 20, TimeUnit.SECONDS); + } + + super.updateBedrockMetadata(entityMetadata, session); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java index 263d00416..5f77fdc41 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java +++ b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java @@ -98,7 +98,7 @@ public enum EntityType { TRIPOD_CAMERA(Entity.class, 62, 0f), PLAYER(PlayerEntity.class, 63, 1.8f, 0.6f, 0.6f, 1.62f), ITEM(ItemEntity.class, 64, 0.25f, 0.25f), - TNT(Entity.class, 65, 0.98f, 0.98f), + TNT(TNTEntity.class, 65, 0.98f, 0.98f), FALLING_BLOCK(FallingBlockEntity.class, 66, 0.98f, 0.98f), MOVING_BLOCK(Entity.class, 67, 0f), EXPERIENCE_BOTTLE(ThrowableEntity.class, 68, 0.25f, 0.25f), diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java index aabf4b645..e6fa2ee96 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaExplosionTranslator.java @@ -28,7 +28,12 @@ package org.geysermc.connector.network.translators.java.world; import com.github.steveice10.mc.protocol.data.game.world.block.ExplodedBlockRecord; import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerExplosionPacket; +import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3i; +import com.nukkitx.protocol.bedrock.data.LevelEventType; +import com.nukkitx.protocol.bedrock.data.SoundEvent; +import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; +import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @@ -41,7 +46,22 @@ public class JavaExplosionTranslator extends PacketTranslator Date: Sun, 3 May 2020 15:56:46 -0500 Subject: [PATCH 19/22] Fix playsounds --- .../JavaPlayerPlaySoundTranslator.java | 41 ++++++++++--------- .../geysermc/connector/utils/SoundUtils.java | 4 -- 2 files changed, 21 insertions(+), 24 deletions(-) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{entity/player => world}/JavaPlayerPlaySoundTranslator.java (63%) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayerPlaySoundTranslator.java similarity index 63% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayerPlaySoundTranslator.java index 2bc3a794a..effb71c5f 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayerPlaySoundTranslator.java @@ -1,29 +1,30 @@ /* * Copyright (c) 2019-2020 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: + * 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 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. + * 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 * - * @author GeyserMC - * @link https://github.com/GeyserMC/Geyser */ -package org.geysermc.connector.network.translators.java.entity.player; +package org.geysermc.connector.network.translators.java.world; import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound; import com.github.steveice10.mc.protocol.data.game.world.sound.CustomSound; @@ -50,7 +51,7 @@ public class JavaPlayerPlaySoundTranslator extends PacketTranslator " + soundMapping + (soundMapping == null ? "[not found]" : "") @@ -67,7 +68,7 @@ public class JavaPlayerPlaySoundTranslator extends PacketTranslator Date: Sun, 3 May 2020 23:56:07 -0500 Subject: [PATCH 20/22] Map most all missing sounds --- .../world/JavaPlayBuiltinSoundTranslator.java | 12 +++-- .../java/world/JavaPlayEffectTranslator.java | 20 ++++++-- .../block/ComparatorSoundInteractHandler.java | 48 +++++++++++++++++++ .../block/DoorSoundInteractionHandler.java | 2 +- .../block/LeverSoundInteractionHandler.java | 2 +- connector/src/main/resources/mappings | 2 +- 6 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractHandler.java diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java index 2e3d3d5f3..aa4ade4ad 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java @@ -34,6 +34,7 @@ import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; +import org.geysermc.connector.network.translators.world.block.BlockTranslator; import org.geysermc.connector.utils.SoundUtils; @Translator(packet = ServerPlayBuiltinSoundPacket.class) @@ -72,22 +73,23 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator Date: Mon, 4 May 2020 00:29:22 -0500 Subject: [PATCH 21/22] Update mappings --- connector/src/main/resources/mappings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index 311b83fb8..ddb62693f 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit 311b83fb85897531d5a803afc27f666bb5626b97 +Subproject commit ddb62693f878a99f106a0d6ea16a92ec7c4c7cd0 From e798ca9d045f3eeb4f8b1c89db5a45c8c114f6d6 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Mon, 4 May 2020 00:52:18 -0500 Subject: [PATCH 22/22] Remove sounds and block particles from TODO on README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index f11b9bfb3..713e77b72 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,6 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set - [ ] Cartography Table - [ ] Stonecutter - [ ] Villager Trading -- Sounds -- Block Particles - Some Entity Flags ## Compiling