From 84ae28f2c21c737b575bc7f11dd4f4e226e70877 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Fri, 12 Nov 2021 23:01:45 -0500 Subject: [PATCH] Update translator class names to match Mojang mappings --- .../main/java/org/geysermc/connector/entity/Entity.java | 8 ++++---- .../translators/MerchantInventoryTranslator.java | 2 +- ...sticsTranslator.java => JavaAwardStatsTranslator.java} | 2 +- ...ossBarTranslator.java => JavaBossEventTranslator.java} | 3 ++- ...ranslator.java => JavaChangeDifficultyTranslator.java} | 2 +- ...ommandsTranslator.java => JavaCommandsTranslator.java} | 2 +- ...geTranslator.java => JavaCustomPayloadTranslator.java} | 2 +- ...uestTranslator.java => JavaCustomQueryTranslator.java} | 5 ++++- ...isconnectPacket.java => JavaDisconnectTranslator.java} | 2 +- ...vaJoinGameTranslator.java => JavaLoginTranslator.java} | 2 +- ...ator.java => JavaSelectAdvancementsTabTranslator.java} | 2 +- ...nslator.java => JavaUpdateAdvancementsTranslator.java} | 2 +- ...esTranslator.java => JavaUpdateRecipesTranslator.java} | 2 +- ...eTagsTranslator.java => JavaUpdateTagsTranslator.java} | 2 +- ...nimationTranslator.java => JavaAnimateTranslator.java} | 2 +- ...atusTranslator.java => JavaEntityEventTranslator.java} | 2 +- ...ranslator.java => JavaMoveEntityPosRotTranslator.java} | 2 +- ...onTranslator.java => JavaMoveEntityPosTranslator.java} | 2 +- ...onTranslator.java => JavaMoveEntityRotTranslator.java} | 2 +- ...Translator.java => JavaRemoveMobEffectTranslator.java} | 2 +- ...dLookTranslator.java => JavaRotateHeadTranslator.java} | 2 +- ...taTranslator.java => JavaSetEntityDataTranslator.java} | 2 +- ...chTranslator.java => JavaSetEntityLinkTranslator.java} | 2 +- ...Translator.java => JavaSetEntityMotionTranslator.java} | 6 ++++-- ...entTranslator.java => JavaSetEquipmentTranslator.java} | 2 +- ...rsTranslator.java => JavaSetPassengersTranslator.java} | 2 +- ...mTranslator.java => JavaTakeItemEntityTranslator.java} | 2 +- ...tTranslator.java => JavaTeleportEntityTranslator.java} | 2 +- ...ranslator.java => JavaUpdateAttributesTranslator.java} | 2 +- ...Translator.java => JavaUpdateMobEffectTranslator.java} | 2 +- ...ckTranslator.java => JavaBlockBreakAckTranslator.java} | 2 +- ...EntryTranslator.java => JavaPlayerInfoTranslator.java} | 2 +- ...nTranslator.java => JavaPlayerPositionTranslator.java} | 2 +- ...mTranslator.java => JavaSetCarriedItemTranslator.java} | 2 +- ...ceTranslator.java => JavaSetExperienceTranslator.java} | 2 +- ...HealthTranslator.java => JavaSetHealthTranslator.java} | 2 +- ...EntityTranslator.java => JavaAddEntityTranslator.java} | 2 +- ...ranslator.java => JavaAddExperienceOrbTranslator.java} | 2 +- ...ingEntityTranslator.java => JavaAddMobTranslator.java} | 2 +- ...tingTranslator.java => JavaAddPaintingTranslator.java} | 2 +- ...PlayerTranslator.java => JavaAddPlayerTranslator.java} | 2 +- ...ranslator.java => JavaBlockDestructionTranslator.java} | 2 +- ...Translator.java => JavaBlockEntityDataTranslator.java} | 2 +- ...ValueTranslator.java => JavaBlockEventTranslator.java} | 2 +- ...angeTranslator.java => JavaBlockUpdateTranslator.java} | 2 +- ...oundTranslator.java => JavaCustomSoundTranslator.java} | 2 +- ...xplosionTranslator.java => JavaExplodeTranslator.java} | 2 +- ...ranslator.java => JavaForgetLevelChunkTranslator.java} | 2 +- ...ClientTranslator.java => JavaGameEventTranslator.java} | 2 +- ...kDataTranslator.java => JavaLevelChunkTranslator.java} | 2 +- ...ffectTranslator.java => JavaLevelEventTranslator.java} | 2 +- ...eTranslator.java => JavaLevelParticlesTranslator.java} | 2 +- ...DataTranslator.java => JavaMapItemDataTranslator.java} | 3 ++- ...slator.java => JavaSectionBlocksUpdateTranslator.java} | 2 +- ...slator.java => JavaSetChunkCacheCenterTranslator.java} | 2 +- ...slator.java => JavaSetChunkCacheRadiusTranslator.java} | 2 +- ...or.java => JavaSetDefaultSpawnPositionTranslator.java} | 2 +- ...dateTimeTranslator.java => JavaSetTimeTranslator.java} | 2 +- ...iltinSoundTranslator.java => JavaSoundTranslator.java} | 2 +- ...slator.java => JavaSetDisplayObjectiveTranslator.java} | 2 +- ...iveTranslator.java => JavaSetObjectiveTranslator.java} | 2 +- ...amTranslator.java => JavaSetPlayerTeamTranslator.java} | 2 +- ...teScoreTranslator.java => JavaSetScoreTranslator.java} | 4 ++-- ...wTranslator.java => JavaContainerCloseTranslator.java} | 2 +- ...slator.java => JavaContainerSetContentTranslator.java} | 2 +- ...ranslator.java => JavaContainerSetDataTranslator.java} | 2 +- ...ranslator.java => JavaContainerSetSlotTranslator.java} | 2 +- ...Translator.java => JavaHorseScreenOpenTranslator.java} | 2 +- ...tTranslator.java => JavaMerchantOffersTranslator.java} | 2 +- ...indowTranslator.java => JavaOpenScreenTranslator.java} | 2 +- 70 files changed, 82 insertions(+), 75 deletions(-) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaStatisticsTranslator.java => JavaAwardStatsTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaBossBarTranslator.java => JavaBossEventTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaDifficultyTranslator.java => JavaChangeDifficultyTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaDeclareCommandsTranslator.java => JavaCommandsTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaPluginMessageTranslator.java => JavaCustomPayloadTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaLoginPluginRequestTranslator.java => JavaCustomQueryTranslator.java} (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaDisconnectPacket.java => JavaDisconnectTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaJoinGameTranslator.java => JavaLoginTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaAdvancementsTabTranslator.java => JavaSelectAdvancementsTabTranslator.java} (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaAdvancementsTranslator.java => JavaUpdateAdvancementsTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaDeclareRecipesTranslator.java => JavaUpdateRecipesTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/{JavaDeclareTagsTranslator.java => JavaUpdateTagsTranslator.java} (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityAnimationTranslator.java => JavaAnimateTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityStatusTranslator.java => JavaEntityEventTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityPositionRotationTranslator.java => JavaMoveEntityPosRotTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityPositionTranslator.java => JavaMoveEntityPosTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityRotationTranslator.java => JavaMoveEntityRotTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityRemoveEffectTranslator.java => JavaRemoveMobEffectTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityHeadLookTranslator.java => JavaRotateHeadTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityMetadataTranslator.java => JavaSetEntityDataTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityAttachTranslator.java => JavaSetEntityLinkTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityVelocityTranslator.java => JavaSetEntityMotionTranslator.java} (93%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityEquipmentTranslator.java => JavaSetEquipmentTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntitySetPassengersTranslator.java => JavaSetPassengersTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityCollectItemTranslator.java => JavaTakeItemEntityTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityTeleportTranslator.java => JavaTeleportEntityTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityPropertiesTranslator.java => JavaUpdateAttributesTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaEntityEffectTranslator.java => JavaUpdateMobEffectTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/{JavaPlayerActionAckTranslator.java => JavaBlockBreakAckTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/{JavaPlayerListEntryTranslator.java => JavaPlayerInfoTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/{JavaPlayerPositionRotationTranslator.java => JavaPlayerPositionTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/{JavaPlayerChangeHeldItemTranslator.java => JavaSetCarriedItemTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/{JavaPlayerSetExperienceTranslator.java => JavaSetExperienceTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/{JavaPlayerHealthTranslator.java => JavaSetHealthTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/{JavaSpawnEntityTranslator.java => JavaAddEntityTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/{JavaSpawnExpOrbTranslator.java => JavaAddExperienceOrbTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/{JavaSpawnLivingEntityTranslator.java => JavaAddMobTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/{JavaSpawnPaintingTranslator.java => JavaAddPaintingTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/{JavaSpawnPlayerTranslator.java => JavaAddPlayerTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaBlockBreakAnimTranslator.java => JavaBlockDestructionTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaUpdateTileEntityTranslator.java => JavaBlockEntityDataTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaBlockValueTranslator.java => JavaBlockEventTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaBlockChangeTranslator.java => JavaBlockUpdateTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaPlaySoundTranslator.java => JavaCustomSoundTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaExplosionTranslator.java => JavaExplodeTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaUnloadChunkTranslator.java => JavaForgetLevelChunkTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaNotifyClientTranslator.java => JavaGameEventTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaChunkDataTranslator.java => JavaLevelChunkTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaPlayEffectTranslator.java => JavaLevelEventTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaSpawnParticleTranslator.java => JavaLevelParticlesTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaMapDataTranslator.java => JavaMapItemDataTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaMultiBlockChangeTranslator.java => JavaSectionBlocksUpdateTranslator.java} (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaUpdateViewPositionTranslator.java => JavaSetChunkCacheCenterTranslator.java} (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaUpdateViewDistanceTranslator.java => JavaSetChunkCacheRadiusTranslator.java} (94%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaSpawnPositionTranslator.java => JavaSetDefaultSpawnPositionTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaUpdateTimeTranslator.java => JavaSetTimeTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/level/{JavaPlayBuiltinSoundTranslator.java => JavaSoundTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/{JavaDisplayScoreboardTranslator.java => JavaSetDisplayObjectiveTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/{JavaScoreboardObjectiveTranslator.java => JavaSetObjectiveTranslator.java} (97%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/{JavaTeamTranslator.java => JavaSetPlayerTeamTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/{JavaUpdateScoreTranslator.java => JavaSetScoreTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaCloseWindowTranslator.java => JavaContainerCloseTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaWindowItemsTranslator.java => JavaContainerSetContentTranslator.java} (96%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaWindowPropertyTranslator.java => JavaContainerSetDataTranslator.java} (95%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaSetSlotTranslator.java => JavaContainerSetSlotTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaOpenHorseWindowTranslator.java => JavaHorseScreenOpenTranslator.java} (99%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaTradeListTranslator.java => JavaMerchantOffersTranslator.java} (98%) rename connector/src/main/java/org/geysermc/connector/network/translators/java/window/{JavaOpenWindowTranslator.java => JavaOpenScreenTranslator.java} (98%) diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/connector/src/main/java/org/geysermc/connector/entity/Entity.java index fe0077d5d..a965b35da 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/Entity.java +++ b/connector/src/main/java/org/geysermc/connector/entity/Entity.java @@ -186,7 +186,7 @@ public class Entity { } /** - * Teleports an entity to a new location. Used in JavaEntityTeleportTranslator. + * Teleports an entity to a new location. Used in JavaTeleportEntityTranslator. * @param session GeyserSession. * @param position The new position of the entity. * @param yaw The new yaw of the entity. @@ -198,7 +198,7 @@ public class Entity { } /** - * Updates an entity's head position. Used in JavaEntityHeadLookTranslator. + * Updates an entity's head position. Used in JavaRotateHeadTranslator. * @param session GeyserSession. * @param headYaw The new head rotation of the entity. */ @@ -207,7 +207,7 @@ public class Entity { } /** - * Updates an entity's position and rotation. Used in JavaEntityPositionRotationTranslator. + * Updates an entity's position and rotation. Used in JavaMoveEntityPosRotTranslator. * @param session GeyserSession * @param moveX The new X offset of the current position. * @param moveY The new Y offset of the current position. @@ -221,7 +221,7 @@ public class Entity { } /** - * Updates an entity's rotation. Used in JavaEntityRotationTranslator. + * Updates an entity's rotation. Used in JavaMoveEntityRotTranslator. * @param session GeyserSession. * @param yaw The new yaw of the entity. * @param pitch The new pitch of the entity. diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java index 63531ba8a..ef6e30494 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java @@ -119,7 +119,7 @@ public class MerchantInventoryTranslator extends BaseInventoryTranslator { @Override public void openInventory(GeyserSession session, Inventory inventory) { - //Handled in JavaTradeListTranslator + //Handled in JavaMerchantOffersTranslator //TODO: send a blank inventory here in case the villager doesn't send a TradeList packet } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaStatisticsTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaStatisticsTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java index 69a82efe0..141079755 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaStatisticsTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.StatisticsUtils; @Translator(packet = ClientboundAwardStatsPacket.class) -public class JavaStatisticsTranslator extends PacketTranslator { +public class JavaAwardStatsTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAwardStatsPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossBarTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossBarTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java index 889e31e4d..eae326538 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossBarTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java @@ -33,7 +33,8 @@ import org.geysermc.connector.network.translators.Translator; import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundBossEventPacket; @Translator(packet = ClientboundBossEventPacket.class) -public class JavaBossBarTranslator extends PacketTranslator { +public class JavaBossEventTranslator extends PacketTranslator { + @Override public void translate(GeyserSession session, ClientboundBossEventPacket packet) { BossBar bossBar = session.getEntityCache().getBossBar(packet.getUuid()); diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDifficultyTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDifficultyTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java index 56c32ca95..37660ef99 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDifficultyTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.Translator; import com.nukkitx.protocol.bedrock.packet.SetDifficultyPacket; @Translator(packet = ClientboundChangeDifficultyPacket.class) -public class JavaDifficultyTranslator extends PacketTranslator { +public class JavaChangeDifficultyTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundChangeDifficultyPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareCommandsTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareCommandsTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java index 61e8be4a5..ddc05b62f 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareCommandsTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java @@ -54,7 +54,7 @@ import org.geysermc.connector.utils.EntityUtils; import java.util.*; @Translator(packet = ClientboundCommandsPacket.class) -public class JavaDeclareCommandsTranslator extends PacketTranslator { +public class JavaCommandsTranslator extends PacketTranslator { private static final String[] ALL_EFFECT_IDENTIFIERS = EntityUtils.getAllEffectIdentifiers(); private static final String[] ENUM_BOOLEAN = {"true", "false"}; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java index 2b5926b2c..b0989f674 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomPayloadTranslator.java @@ -42,7 +42,7 @@ import org.geysermc.cumulus.util.FormType; import java.nio.charset.StandardCharsets; @Translator(packet = ClientboundCustomPayloadPacket.class) -public class JavaPluginMessageTranslator extends PacketTranslator { +public class JavaCustomPayloadTranslator extends PacketTranslator { private final GeyserLogger logger = GeyserConnector.getInstance().getLogger(); @Override diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginPluginRequestTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginPluginRequestTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java index 9f734acc4..69567957c 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginPluginRequestTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java @@ -31,8 +31,11 @@ import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; +/** + * For the login cycle. + */ @Translator(packet = ClientboundCustomQueryPacket.class) -public class JavaLoginPluginRequestTranslator extends PacketTranslator { +public class JavaCustomQueryTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundCustomQueryPacket packet) { // A vanilla client doesn't know any PluginMessage in the Login state, so we don't know any either. diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectPacket.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectPacket.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java index 72a9646fe..58493b14d 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectPacket.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.network.translators.chat.MessageTranslator; @Translator(packet = ClientboundDisconnectPacket.class) -public class JavaDisconnectPacket extends PacketTranslator { +public class JavaDisconnectTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundDisconnectPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java index 932b205a0..dc4678ae2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java @@ -48,7 +48,7 @@ import java.util.Arrays; import java.util.List; @Translator(packet = ClientboundLoginPacket.class) -public class JavaJoinGameTranslator extends PacketTranslator { +public class JavaLoginTranslator extends PacketTranslator { private static final List SKIN_PART_VALUES = Arrays.asList(SkinPart.values()); @Override diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAdvancementsTabTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAdvancementsTabTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java index f9659f038..16e5f9de9 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAdvancementsTabTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java @@ -35,7 +35,7 @@ import org.geysermc.connector.network.translators.Translator; * Indicates that the client should open a particular advancement tab */ @Translator(packet = ClientboundSelectAdvancementsTabPacket.class) -public class JavaAdvancementsTabTranslator extends PacketTranslator { +public class JavaSelectAdvancementsTabTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSelectAdvancementsTabPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAdvancementsTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAdvancementsTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java index 46aac1212..cd1a5dbec 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaAdvancementsTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java @@ -39,7 +39,7 @@ import org.geysermc.connector.utils.LocaleUtils; import java.util.Map; @Translator(packet = ClientboundUpdateAdvancementsPacket.class) -public class JavaAdvancementsTranslator extends PacketTranslator { +public class JavaUpdateAdvancementsTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundUpdateAdvancementsPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareRecipesTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareRecipesTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java index b0dff45de..9306453bc 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareRecipesTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java @@ -59,7 +59,7 @@ import static org.geysermc.connector.utils.InventoryUtils.LAST_RECIPE_NET_ID; * Bedrock REQUIRES a CraftingDataPacket to be sent in order to craft anything. */ @Translator(packet = ClientboundUpdateRecipesPacket.class) -public class JavaDeclareRecipesTranslator extends PacketTranslator { +public class JavaUpdateRecipesTranslator extends PacketTranslator { /** * Required to use the specified cartography table recipes */ diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareTagsTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareTagsTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java index a6c532919..4330b2e91 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaDeclareTagsTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java @@ -31,7 +31,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundUpdateTagsPacket.class) -public class JavaDeclareTagsTranslator extends PacketTranslator { +public class JavaUpdateTagsTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundUpdateTagsPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityAnimationTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityAnimationTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java index 95a1628df..11fec73b3 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityAnimationTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java @@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.DimensionUtils; @Translator(packet = ClientboundAnimatePacket.class) -public class JavaEntityAnimationTranslator extends PacketTranslator { +public class JavaAnimateTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAnimatePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityStatusTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityStatusTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java index 1c943ce8b..9774b2456 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityStatusTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java @@ -42,7 +42,7 @@ import org.geysermc.connector.network.translators.Translator; import java.util.concurrent.ThreadLocalRandom; @Translator(packet = ClientboundEntityEventPacket.class) -public class JavaEntityStatusTranslator extends PacketTranslator { +public class JavaEntityEventTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundEntityEventPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPositionRotationTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPositionRotationTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java index 419010a2f..ec9fde618 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPositionRotationTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosRotTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundMoveEntityPosRotPacket.class) -public class JavaEntityPositionRotationTranslator extends PacketTranslator { +public class JavaMoveEntityPosRotTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundMoveEntityPosRotPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPositionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPositionTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java index f43afbe9b..e21476a6c 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPositionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundMoveEntityPosPacket.class) -public class JavaEntityPositionTranslator extends PacketTranslator { +public class JavaMoveEntityPosTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundMoveEntityPosPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRotationTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRotationTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java index 846914ebe..36bd6741e 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRotationTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundMoveEntityRotPacket.class) -public class JavaEntityRotationTranslator extends PacketTranslator { +public class JavaMoveEntityRotTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundMoveEntityRotPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRemoveEffectTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRemoveEffectTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java index efb1ed75b..057af9667 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRemoveEffectTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.EntityUtils; @Translator(packet = ClientboundRemoveMobEffectPacket.class) -public class JavaEntityRemoveEffectTranslator extends PacketTranslator { +public class JavaRemoveMobEffectTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundRemoveMobEffectPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityHeadLookTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityHeadLookTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java index 97a4f16d5..3ad40abd0 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityHeadLookTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundRotateHeadPacket.class) -public class JavaEntityHeadLookTranslator extends PacketTranslator { +public class JavaRotateHeadTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundRotateHeadPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java index d55a4e747..1172509b9 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java @@ -35,7 +35,7 @@ import org.geysermc.connector.utils.InteractiveTagManager; import org.geysermc.connector.utils.LanguageUtils; @Translator(packet = ClientboundSetEntityDataPacket.class) -public class JavaEntityMetadataTranslator extends PacketTranslator { +public class JavaSetEntityDataTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetEntityDataPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityAttachTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityAttachTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java index 672a2d15b..0fd9b0c64 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityAttachTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java @@ -39,7 +39,7 @@ import org.geysermc.connector.network.translators.Translator; * Called when a leash is attached, removed or updated from an entity */ @Translator(packet = ClientboundSetEntityLinkPacket.class) -public class JavaEntityAttachTranslator extends PacketTranslator { +public class JavaSetEntityLinkTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetEntityLinkPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityVelocityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java similarity index 93% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityVelocityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java index c563b84d7..3ec366825 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityVelocityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java @@ -37,13 +37,15 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.SetEntityMotionPacket; @Translator(packet = ClientboundSetEntityMotionPacket.class) -public class JavaEntityVelocityTranslator extends PacketTranslator { +public class JavaSetEntityMotionTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetEntityMotionPacket packet) { - Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId()); + Entity entity; if (packet.getEntityId() == session.getPlayerEntity().getEntityId()) { entity = session.getPlayerEntity(); + } else { + entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId()); } if (entity == null) return; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java index 3df6df2b0..2b5cceb37 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java @@ -36,7 +36,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.network.translators.item.ItemTranslator; @Translator(packet = ClientboundSetEquipmentPacket.class) -public class JavaEntityEquipmentTranslator extends PacketTranslator { +public class JavaSetEquipmentTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetEquipmentPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntitySetPassengersTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntitySetPassengersTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java index 081f59f37..dc6553492 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntitySetPassengersTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetPassengersTranslator.java @@ -40,7 +40,7 @@ import org.geysermc.connector.utils.EntityUtils; import java.util.Arrays; @Translator(packet = ClientboundSetPassengersPacket.class) -public class JavaEntitySetPassengersTranslator extends PacketTranslator { +public class JavaSetPassengersTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetPassengersPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java index 8bc497b8d..b56414c47 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTakeItemEntityTranslator.java @@ -41,7 +41,7 @@ import org.geysermc.connector.network.translators.Translator; * Bedrock uses it for arrows and item entities, but not experience orbs. */ @Translator(packet = ClientboundTakeItemEntityPacket.class) -public class JavaEntityCollectItemTranslator extends PacketTranslator { +public class JavaTakeItemEntityTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundTakeItemEntityPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityTeleportTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityTeleportTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java index bbc852cfe..8fbd234a9 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityTeleportTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaTeleportEntityTranslator.java @@ -33,7 +33,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundTeleportEntityPacket.class) -public class JavaEntityTeleportTranslator extends PacketTranslator { +public class JavaTeleportEntityTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundTeleportEntityPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPropertiesTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPropertiesTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java index 9f00a1832..84946c208 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityPropertiesTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java @@ -33,7 +33,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundUpdateAttributesPacket.class) -public class JavaEntityPropertiesTranslator extends PacketTranslator { +public class JavaUpdateAttributesTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundUpdateAttributesPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEffectTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEffectTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java index 3e8c056cb..f8c276896 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEffectTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.EntityUtils; @Translator(packet = ClientboundUpdateMobEffectPacket.class) -public class JavaEntityEffectTranslator extends PacketTranslator { +public class JavaUpdateMobEffectTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundUpdateMobEffectPacket packet) { 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/JavaBlockBreakAckTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java index 1037bcb85..c2941a5ae 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/JavaBlockBreakAckTranslator.java @@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.world.block.BlockStateValues; import org.geysermc.connector.utils.ChunkUtils; @Translator(packet = ClientboundBlockBreakAckPacket.class) -public class JavaPlayerActionAckTranslator extends PacketTranslator { +public class JavaBlockBreakAckTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundBlockBreakAckPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java index 0ce643971..587481c18 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java @@ -38,7 +38,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.skin.SkinManager; @Translator(packet = ClientboundPlayerInfoPacket.class) -public class JavaPlayerListEntryTranslator extends PacketTranslator { +public class JavaPlayerInfoTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundPlayerInfoPacket packet) { if (packet.getAction() != PlayerListEntryAction.ADD_PLAYER && packet.getAction() != PlayerListEntryAction.REMOVE_PLAYER) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java index 95e6f1f8e..1c3866adf 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionTranslator.java @@ -47,7 +47,7 @@ import org.geysermc.connector.utils.EntityUtils; import org.geysermc.connector.utils.LanguageUtils; @Translator(packet = ClientboundPlayerPositionPacket.class) -public class JavaPlayerPositionRotationTranslator extends PacketTranslator { +public class JavaPlayerPositionTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundPlayerPositionPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerChangeHeldItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerChangeHeldItemTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java index 184aabfad..c36a21dec 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerChangeHeldItemTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetCarriedItemTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundSetCarriedItemPacket.class) -public class JavaPlayerChangeHeldItemTranslator extends PacketTranslator { +public class JavaSetCarriedItemTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetCarriedItemPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerSetExperienceTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerSetExperienceTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java index b90c5b7f3..61427b3b2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerSetExperienceTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java @@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.Translator; import java.util.Arrays; @Translator(packet = ClientboundSetExperiencePacket.class) -public class JavaPlayerSetExperienceTranslator extends PacketTranslator { +public class JavaSetExperienceTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetExperiencePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerHealthTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerHealthTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java index 79a9e61e1..11e8ab21b 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerHealthTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java @@ -38,7 +38,7 @@ import org.geysermc.connector.network.translators.Translator; import java.util.List; @Translator(packet = ClientboundSetHealthPacket.class) -public class JavaPlayerHealthTranslator extends PacketTranslator { +public class JavaSetHealthTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetHealthPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java index dc5c7b459..fb22e2cc2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java @@ -43,7 +43,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @Translator(packet = ClientboundAddEntityPacket.class) -public class JavaSpawnEntityTranslator extends PacketTranslator { +public class JavaAddEntityTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAddEntityPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnExpOrbTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnExpOrbTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java index 56cf457da..263170f95 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnExpOrbTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java @@ -35,7 +35,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundAddExperienceOrbPacket.class) -public class JavaSpawnExpOrbTranslator extends PacketTranslator { +public class JavaAddExperienceOrbTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAddExperienceOrbPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnLivingEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnLivingEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java index b6414b2ac..f1fe12c26 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnLivingEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java @@ -39,7 +39,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @Translator(packet = ClientboundAddMobPacket.class) -public class JavaSpawnLivingEntityTranslator extends PacketTranslator { +public class JavaAddMobTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAddMobPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnPaintingTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnPaintingTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java index 595b77d33..790e79ecf 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnPaintingTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.PaintingType; @Translator(packet = ClientboundAddPaintingPacket.class) -public class JavaSpawnPaintingTranslator extends PacketTranslator { +public class JavaAddPaintingTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAddPaintingPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnPlayerTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnPlayerTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java index d574da825..0cf689f77 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnPlayerTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java @@ -36,7 +36,7 @@ import org.geysermc.connector.utils.LanguageUtils; import org.geysermc.connector.skin.SkinManager; @Translator(packet = ClientboundAddPlayerPacket.class) -public class JavaSpawnPlayerTranslator extends PacketTranslator { +public class JavaAddPlayerTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundAddPlayerPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockBreakAnimTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockBreakAnimTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java index 1e64eb565..3b0e4d891 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockBreakAnimTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java @@ -38,7 +38,7 @@ import org.geysermc.connector.registry.type.ItemMapping; import org.geysermc.connector.utils.BlockUtils; @Translator(packet = ClientboundBlockDestructionPacket.class) -public class JavaBlockBreakAnimTranslator extends PacketTranslator { +public class JavaBlockDestructionTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundBlockDestructionPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateTileEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateTileEntityTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java index 2f38dd8e9..5ef32f151 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateTileEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java @@ -42,7 +42,7 @@ import org.geysermc.connector.network.translators.world.block.entity.SkullBlockE import org.geysermc.connector.utils.BlockEntityUtils; @Translator(packet = ClientboundBlockEntityDataPacket.class) -public class JavaUpdateTileEntityTranslator extends PacketTranslator { +public class JavaBlockEntityDataTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundBlockEntityDataPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockValueTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockValueTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java index 3b103c5ed..ec19e67db 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockValueTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEventTranslator.java @@ -45,7 +45,7 @@ import org.geysermc.connector.network.translators.world.block.entity.PistonBlock import org.geysermc.connector.utils.Direction; @Translator(packet = ClientboundBlockEventPacket.class) -public class JavaBlockValueTranslator extends PacketTranslator { +public class JavaBlockEventTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundBlockEventPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockChangeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockChangeTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java index 8ed714710..67174434a 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockChangeTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java @@ -39,7 +39,7 @@ import org.geysermc.connector.registry.BlockRegistries; import org.geysermc.connector.utils.ChunkUtils; @Translator(packet = ClientboundBlockUpdatePacket.class) -public class JavaBlockChangeTranslator extends PacketTranslator { +public class JavaBlockUpdateTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundBlockUpdatePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlaySoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlaySoundTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java index 0ad48e02c..34f685b22 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlaySoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaCustomSoundTranslator.java @@ -37,7 +37,7 @@ import org.geysermc.connector.registry.Registries; import org.geysermc.connector.registry.type.SoundMapping; @Translator(packet = ClientboundCustomSoundPacket.class) -public class JavaPlaySoundTranslator extends PacketTranslator { +public class JavaCustomSoundTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundCustomSoundPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplosionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplosionTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java index c8af1d1d7..f8a2bc286 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplosionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaExplodeTranslator.java @@ -41,7 +41,7 @@ import org.geysermc.connector.network.translators.world.block.BlockStateValues; import org.geysermc.connector.utils.ChunkUtils; @Translator(packet = ClientboundExplodePacket.class) -public class JavaExplosionTranslator extends PacketTranslator { +public class JavaExplodeTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundExplodePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUnloadChunkTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUnloadChunkTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java index fdc43e758..696ec3d92 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUnloadChunkTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.network.translators.Translator; import java.util.Iterator; @Translator(packet = ClientboundForgetLevelChunkPacket.class) -public class JavaUnloadChunkTranslator extends PacketTranslator { +public class JavaForgetLevelChunkTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundForgetLevelChunkPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaNotifyClientTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaNotifyClientTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java index 3b9948530..f9eca2e74 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaNotifyClientTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaGameEventTranslator.java @@ -46,7 +46,7 @@ import org.geysermc.connector.network.translators.inventory.translators.PlayerIn import org.geysermc.connector.utils.LocaleUtils; @Translator(packet = ClientboundGameEventPacket.class) -public class JavaNotifyClientTranslator extends PacketTranslator { +public class JavaGameEventTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundGameEventPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaChunkDataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaChunkDataTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkTranslator.java index 139924858..3673f48e0 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaChunkDataTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkTranslator.java @@ -47,7 +47,7 @@ import static org.geysermc.connector.utils.ChunkUtils.MINIMUM_ACCEPTED_HEIGHT; import static org.geysermc.connector.utils.ChunkUtils.MINIMUM_ACCEPTED_HEIGHT_OVERWORLD; @Translator(packet = ClientboundLevelChunkPacket.class) -public class JavaChunkDataTranslator extends PacketTranslator { +public class JavaLevelChunkTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundLevelChunkPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlayEffectTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlayEffectTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java index 83eefb10b..d57190abf 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlayEffectTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelEventTranslator.java @@ -46,7 +46,7 @@ import java.util.Collections; import java.util.Locale; @Translator(packet = ClientboundLevelEventPacket.class) -public class JavaPlayEffectTranslator extends PacketTranslator { +public class JavaLevelEventTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundLevelEventPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSpawnParticleTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSpawnParticleTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java index 961dc7fd1..3a5f6b446 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSpawnParticleTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java @@ -47,7 +47,7 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.function.Function; @Translator(packet = ClientboundLevelParticlesPacket.class) -public class JavaSpawnParticleTranslator extends PacketTranslator { +public class JavaLevelParticlesTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundLevelParticlesPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapDataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapDataTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java index ad080e1f0..e0b76f06d 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapDataTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMapItemDataTranslator.java @@ -38,7 +38,8 @@ import org.geysermc.connector.utils.DimensionUtils; import org.geysermc.connector.utils.MapColor; @Translator(packet = ClientboundMapItemDataPacket.class) -public class JavaMapDataTranslator extends PacketTranslator { +public class JavaMapItemDataTranslator extends PacketTranslator { + @Override public void translate(GeyserSession session, ClientboundMapItemDataPacket packet) { com.nukkitx.protocol.bedrock.packet.ClientboundMapItemDataPacket mapItemDataPacket = new com.nukkitx.protocol.bedrock.packet.ClientboundMapItemDataPacket(); diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMultiBlockChangeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMultiBlockChangeTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java index 1d3409af9..0a94fe1f8 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaMultiBlockChangeTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java @@ -33,7 +33,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.ChunkUtils; @Translator(packet = ClientboundSectionBlocksUpdatePacket.class) -public class JavaMultiBlockChangeTranslator extends PacketTranslator { +public class JavaSectionBlocksUpdateTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSectionBlocksUpdatePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateViewPositionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateViewPositionTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java index ced4545c9..6ddbf8eea 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateViewPositionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java @@ -33,7 +33,7 @@ import org.geysermc.connector.utils.ChunkUtils; import com.nukkitx.math.vector.Vector3i; @Translator(packet = ClientboundSetChunkCacheCenterPacket.class) -public class JavaUpdateViewPositionTranslator extends PacketTranslator { +public class JavaSetChunkCacheCenterTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetChunkCacheCenterPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateViewDistanceTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java similarity index 94% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateViewDistanceTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java index faa6e7867..29c2ed094 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateViewDistanceTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java @@ -31,7 +31,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundSetChunkCacheRadiusPacket.class) -public class JavaUpdateViewDistanceTranslator extends PacketTranslator { +public class JavaSetChunkCacheRadiusTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetChunkCacheRadiusPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSpawnPositionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSpawnPositionTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java index ae96ada79..025b09882 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSpawnPositionTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.DimensionUtils; @Translator(packet = ClientboundSetDefaultSpawnPositionPacket.class) -public class JavaSpawnPositionTranslator extends PacketTranslator { +public class JavaSetDefaultSpawnPositionTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetDefaultSpawnPositionPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateTimeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateTimeTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java index e478fb3a5..1c2081bc3 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaUpdateTimeTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.PacketTranslator; import org.geysermc.connector.network.translators.Translator; @Translator(packet = ClientboundSetTimePacket.class) -public class JavaUpdateTimeTranslator extends PacketTranslator { +public class JavaSetTimeTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetTimePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlayBuiltinSoundTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java index 49d36ca38..dbf331aa2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaPlayBuiltinSoundTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java @@ -41,7 +41,7 @@ import org.geysermc.connector.registry.Registries; import org.geysermc.connector.registry.type.SoundMapping; @Translator(packet = ClientboundSoundPacket.class) -public class JavaPlayBuiltinSoundTranslator extends PacketTranslator { +public class JavaSoundTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSoundPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaDisplayScoreboardTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaDisplayScoreboardTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java index 27544b94c..be4f4ce8a 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaDisplayScoreboardTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.scoreboard.Scoreboard; import org.geysermc.connector.scoreboard.ScoreboardUpdater; @Translator(packet = ClientboundSetDisplayObjectivePacket.class) -public class JavaDisplayScoreboardTranslator extends PacketTranslator { +public class JavaSetDisplayObjectiveTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundSetDisplayObjectivePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaScoreboardObjectiveTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java similarity index 97% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaScoreboardObjectiveTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java index ad7069503..b74d58175 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaScoreboardObjectiveTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java @@ -42,7 +42,7 @@ import org.geysermc.connector.scoreboard.ScoreboardUpdater; import org.geysermc.connector.scoreboard.UpdateType; @Translator(packet = ClientboundSetObjectivePacket.class) -public class JavaScoreboardObjectiveTranslator extends PacketTranslator { +public class JavaSetObjectiveTranslator extends PacketTranslator { private final GeyserLogger logger = GeyserConnector.getInstance().getLogger(); @Override diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaTeamTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaTeamTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java index 5de4abe83..8d288917a 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaTeamTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java @@ -44,7 +44,7 @@ import java.util.Arrays; import java.util.Set; @Translator(packet = ClientboundSetPlayerTeamPacket.class) -public class JavaTeamTranslator extends PacketTranslator { +public class JavaSetPlayerTeamTranslator extends PacketTranslator { private final GeyserLogger logger = GeyserConnector.getInstance().getLogger(); @Override diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaUpdateScoreTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaUpdateScoreTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java index c4d5b8ec3..7b37dc455 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaUpdateScoreTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java @@ -43,10 +43,10 @@ import org.geysermc.connector.scoreboard.ScoreboardUpdater; import org.geysermc.connector.utils.LanguageUtils; @Translator(packet = ClientboundSetScorePacket.class) -public class JavaUpdateScoreTranslator extends PacketTranslator { +public class JavaSetScoreTranslator extends PacketTranslator { private final GeyserLogger logger; - public JavaUpdateScoreTranslator() { + public JavaSetScoreTranslator() { logger = GeyserConnector.getInstance().getLogger(); } diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaCloseWindowTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerCloseTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaCloseWindowTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerCloseTranslator.java index 096e90684..6cf787eba 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaCloseWindowTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerCloseTranslator.java @@ -32,7 +32,7 @@ import org.geysermc.connector.network.translators.Translator; import org.geysermc.connector.utils.InventoryUtils; @Translator(packet = ClientboundContainerClosePacket.class) -public class JavaCloseWindowTranslator extends PacketTranslator { +public class JavaContainerCloseTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundContainerClosePacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowItemsTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetContentTranslator.java similarity index 96% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowItemsTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetContentTranslator.java index 589f0f6bb..5e62c0d63 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowItemsTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetContentTranslator.java @@ -35,7 +35,7 @@ import org.geysermc.connector.network.translators.inventory.InventoryTranslator; import org.geysermc.connector.utils.InventoryUtils; @Translator(packet = ClientboundContainerSetContentPacket.class) -public class JavaWindowItemsTranslator extends PacketTranslator { +public class JavaContainerSetContentTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundContainerSetContentPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowPropertyTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetDataTranslator.java similarity index 95% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowPropertyTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetDataTranslator.java index 7ce45b086..fcba1fc97 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowPropertyTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetDataTranslator.java @@ -34,7 +34,7 @@ import org.geysermc.connector.network.translators.inventory.InventoryTranslator; import org.geysermc.connector.utils.InventoryUtils; @Translator(packet = ClientboundContainerSetDataPacket.class) -public class JavaWindowPropertyTranslator extends PacketTranslator { +public class JavaContainerSetDataTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundContainerSetDataPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaSetSlotTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetSlotTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaSetSlotTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetSlotTranslator.java index 388d19984..57098c76e 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaSetSlotTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaContainerSetSlotTranslator.java @@ -55,7 +55,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; @Translator(packet = ClientboundContainerSetSlotPacket.class) -public class JavaSetSlotTranslator extends PacketTranslator { +public class JavaContainerSetSlotTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundContainerSetSlotPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenHorseWindowTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaHorseScreenOpenTranslator.java similarity index 99% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenHorseWindowTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaHorseScreenOpenTranslator.java index aea462509..ec1b0ccb3 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenHorseWindowTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaHorseScreenOpenTranslator.java @@ -50,7 +50,7 @@ import java.util.Collections; import java.util.List; @Translator(packet = ClientboundHorseScreenOpenPacket.class) -public class JavaOpenHorseWindowTranslator extends PacketTranslator { +public class JavaHorseScreenOpenTranslator extends PacketTranslator { private static final NbtMap ARMOR_SLOT; private static final NbtMap CARPET_SLOT; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaTradeListTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaMerchantOffersTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaTradeListTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaMerchantOffersTranslator.java index 546c1ddfc..baa5ff2b7 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaTradeListTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaMerchantOffersTranslator.java @@ -48,7 +48,7 @@ import java.util.ArrayList; import java.util.List; @Translator(packet = ClientboundMerchantOffersPacket.class) -public class JavaTradeListTranslator extends PacketTranslator { +public class JavaMerchantOffersTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundMerchantOffersPacket packet) { diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenScreenTranslator.java similarity index 98% rename from connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java rename to connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenScreenTranslator.java index 24c1d022b..36d4e606a 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenScreenTranslator.java @@ -37,7 +37,7 @@ import org.geysermc.connector.utils.InventoryUtils; import org.geysermc.connector.utils.LocaleUtils; @Translator(packet = ClientboundOpenScreenPacket.class) -public class JavaOpenWindowTranslator extends PacketTranslator { +public class JavaOpenScreenTranslator extends PacketTranslator { @Override public void translate(GeyserSession session, ClientboundOpenScreenPacket packet) {