stonecutterRecipes;
-
- /**
- * The current attack speed of the player. Used for sending proper cooldown timings.
- * Setting a default fixes cooldowns not showing up on a fresh world.
- */
- @Setter
- private double attackSpeed = 4.0d;
- /**
- * The time of the last hit. Used to gauge how long the cooldown is taking.
- * This is a session variable in order to prevent more scheduled threads than necessary.
- */
- @Setter
- private long lastHitTime;
-
- /**
- * Saves if the client is steering left on a boat.
- */
- @Setter
- private boolean steeringLeft;
- /**
- * Saves if the client is steering right on a boat.
- */
- @Setter
- private boolean steeringRight;
-
- /**
- * Store the last time the player interacted. Used to fix a right-click spam bug.
- * See https://github.com/GeyserMC/Geyser/issues/503 for context.
- */
- @Setter
- private long lastInteractionTime;
-
- /**
- * Stores a future interaction to place a bucket. Will be cancelled if the client instead intended to
- * interact with a block.
- */
- @Setter
- private ScheduledFuture bucketScheduledFuture;
-
- /**
- * Used to send a movement packet every three seconds if the player hasn't moved. Prevents timeouts when AFK in certain instances.
- */
- @Setter
- private long lastMovementTimestamp = System.currentTimeMillis();
-
- /**
- * Used to send a ServerboundMoveVehiclePacket for every PlayerInputPacket after idling on a boat/horse for more than 100ms
- */
- @Setter
- private long lastVehicleMoveTimestamp = System.currentTimeMillis();
-
- /**
- * Controls whether the daylight cycle gamerule has been sent to the client, so the sun/moon remain motionless.
- */
- private boolean daylightCycle = true;
-
- private boolean reducedDebugInfo = false;
-
- /**
- * The op permission level set by the server
- */
- @Setter
- private int opPermissionLevel = 0;
-
- /**
- * If the current player can fly
- */
- @Setter
- private boolean canFly = false;
-
- /**
- * If the current player is flying
- */
- private boolean flying = false;
-
- /**
- * Caches current rain status.
- */
- @Setter
- private boolean raining = false;
-
- /**
- * Caches current thunder status.
- */
- @Setter
- private boolean thunder = false;
-
- /**
- * Stores the last text inputted into a sign.
- *
- * Bedrock sends packets every time you update the sign, Java only wants the final packet.
- * Until we determine that the user has finished editing, we save the sign's current status.
- */
- @Setter
- private String lastSignMessage;
-
- /**
- * Stores a map of all statistics sent from the server.
- * The server only sends new statistics back to us, so in order to show all statistics we need to cache existing ones.
- */
- private final Map statistics = new HashMap<>();
-
- /**
- * Whether we're expecting statistics to be sent back to us.
- */
- @Setter
- private boolean waitingForStatistics = false;
-
- private final Set emotes;
-
- /**
- * The thread that will run every 50 milliseconds - one Minecraft tick.
- */
- private ScheduledFuture tickThread = null;
-
- private MinecraftProtocol protocol;
-
- public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServerSession, EventLoop eventLoop) {
- this.connector = connector;
- this.upstream = new UpstreamSession(bedrockServerSession);
- this.eventLoop = eventLoop;
-
- this.advancementsCache = new AdvancementsCache(this);
- this.bookEditCache = new BookEditCache(this);
- this.chunkCache = new ChunkCache(this);
- this.entityCache = new EntityCache(this);
- this.effectCache = new EntityEffectCache();
- this.formCache = new FormCache(this);
- this.lodestoneCache = new LodestoneCache();
- this.pistonCache = new PistonCache(this);
- this.preferencesCache = new PreferencesCache(this);
- this.tagCache = new TagCache();
- this.worldCache = new WorldCache(this);
-
- this.worldBorder = new WorldBorder(this);
-
- this.collisionManager = new CollisionManager(this);
-
- this.playerEntity = new SessionPlayerEntity(this);
- collisionManager.updatePlayerBoundingBox(this.playerEntity.getPosition());
-
- this.playerInventory = new PlayerInventory();
- this.openInventory = null;
- this.craftingRecipes = new Int2ObjectOpenHashMap<>();
- this.unlockedRecipes = new ObjectOpenHashSet<>();
- this.lastRecipeNetId = new AtomicInteger(1);
-
- this.spawned = false;
- this.loggedIn = false;
-
- if (connector.getWorldManager().shouldExpectLecternHandled()) {
- // Unneeded on these platforms
- this.lecternCache = null;
- } else {
- this.lecternCache = new ObjectOpenHashSet<>();
- }
-
- if (connector.getConfig().getEmoteOffhandWorkaround() != EmoteOffhandWorkaroundOption.NO_EMOTES) {
- this.emotes = new HashSet<>();
- connector.getSessionManager().getSessions().values().forEach(player -> this.emotes.addAll(player.getEmotes()));
- } else {
- this.emotes = null;
- }
-
- bedrockServerSession.addDisconnectHandler(disconnectReason -> {
- InetAddress address = bedrockServerSession.getRealAddress().getAddress();
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.disconnect", address, disconnectReason));
-
- disconnect(disconnectReason.name());
- connector.getSessionManager().removeSession(this);
- });
-
- this.remoteAddress = connector.getConfig().getRemote().getAddress();
- this.remotePort = connector.getConfig().getRemote().getPort();
- this.remoteAuthType = connector.getConfig().getRemote().getAuthType();
+/**
+ * Deprecated, legacy code. Serves as a wrapper around
+ * the class used now.
+ *
+ * @deprecated legacy code
+ */
+@Deprecated
+public class GeyserSession {
+ private final org.geysermc.geyser.network.session.GeyserSession handle;
+
+ public GeyserSession(org.geysermc.geyser.network.session.GeyserSession handle) {
+ this.handle = handle;
+ }
+
+ public AuthData getAuthData() {
+ return new AuthData(this.handle.getAuthData());
+ }
+
+ public boolean isMicrosoftAccount() {
+ return this.handle.isMicrosoftAccount();
+ }
+
+ public boolean isClosed() {
+ return this.handle.isClosed();
+ }
+
+ public String getRemoteAddress() {
+ return this.handle.getRemoteAddress();
+ }
+
+ public int getRemotePort() {
+ return this.handle.getRemotePort();
+ }
+
+ public int getRenderDistance() {
+ return this.handle.getRenderDistance();
+ }
+
+ public boolean isSentSpawnPacket() {
+ return this.handle.isSentSpawnPacket();
+ }
+
+ public boolean isLoggedIn() {
+ return this.handle.isLoggedIn();
+ }
+
+ public boolean isLoggingIn() {
+ return this.handle.isLoggingIn();
+ }
+
+ public boolean isSpawned() {
+ return this.handle.isSpawned();
+ }
+
+ public boolean isInteracting() {
+ return this.handle.isInteracting();
+ }
+
+ public boolean isCanFly() {
+ return this.handle.isCanFly();
+ }
+
+ public boolean isFlying() {
+ return this.handle.isFlying();
}
- /**
- * Send all necessary packets to load Bedrock into the server
- */
public void connect() {
- startGame();
- sentSpawnPacket = true;
-
- // Set the hardcoded shield ID to the ID we just defined in StartGamePacket
- upstream.getSession().getHardcodedBlockingId().set(this.itemMappings.getStoredItems().shield().getBedrockId());
-
- if (this.itemMappings.getFurnaceMinecartData() != null) {
- ItemComponentPacket componentPacket = new ItemComponentPacket();
- componentPacket.getItems().add(this.itemMappings.getFurnaceMinecartData());
- upstream.sendPacket(componentPacket);
- }
-
- ChunkUtils.sendEmptyChunks(this, playerEntity.getPosition().toInt(), 0, false);
-
- BiomeDefinitionListPacket biomeDefinitionListPacket = new BiomeDefinitionListPacket();
- biomeDefinitionListPacket.setDefinitions(Registries.BIOMES_NBT.get());
- upstream.sendPacket(biomeDefinitionListPacket);
-
- AvailableEntityIdentifiersPacket entityPacket = new AvailableEntityIdentifiersPacket();
- entityPacket.setIdentifiers(Registries.BEDROCK_ENTITY_IDENTIFIERS.get());
- upstream.sendPacket(entityPacket);
-
- CreativeContentPacket creativePacket = new CreativeContentPacket();
- creativePacket.setContents(this.itemMappings.getCreativeItems());
- upstream.sendPacket(creativePacket);
-
- PlayStatusPacket playStatusPacket = new PlayStatusPacket();
- playStatusPacket.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN);
- upstream.sendPacket(playStatusPacket);
-
- UpdateAttributesPacket attributesPacket = new UpdateAttributesPacket();
- attributesPacket.setRuntimeEntityId(getPlayerEntity().getGeyserId());
- // Default move speed
- // Bedrock clients move very fast by default until they get an attribute packet correcting the speed
- attributesPacket.setAttributes(Collections.singletonList(
- new AttributeData("minecraft:movement", 0.0f, 1024f, 0.1f, 0.1f)));
- upstream.sendPacket(attributesPacket);
-
- GameRulesChangedPacket gamerulePacket = new GameRulesChangedPacket();
- // Only allow the server to send health information
- // Setting this to false allows natural regeneration to work false but doesn't break it being true
- gamerulePacket.getGameRules().add(new GameRuleData<>("naturalregeneration", false));
- // Don't let the client modify the inventory on death
- // Setting this to true allows keep inventory to work if enabled but doesn't break functionality being false
- gamerulePacket.getGameRules().add(new GameRuleData<>("keepinventory", true));
- // Ensure client doesn't try and do anything funky; the server handles this for us
- gamerulePacket.getGameRules().add(new GameRuleData<>("spawnradius", 0));
- upstream.sendPacket(gamerulePacket);
+ this.handle.connect();
}
public void login() {
- if (this.remoteAuthType != AuthType.ONLINE) {
- if (this.remoteAuthType == AuthType.OFFLINE) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.offline"));
- } else {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.floodgate"));
- }
- authenticate(authData.getName());
- }
+ this.handle.login();
}
public void authenticate(String username) {
- authenticate(username, "");
+ this.handle.authenticate(username);
}
public void authenticate(String username, String password) {
- if (loggedIn) {
- connector.getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.auth.already_loggedin", username));
- return;
- }
-
- loggingIn = true;
-
- // Use a future to prevent timeouts as all the authentication is handled sync
- // This will be changed with the new protocol library.
- CompletableFuture.supplyAsync(() -> {
- try {
- if (password != null && !password.isEmpty()) {
- AuthenticationService authenticationService;
- if (microsoftAccount) {
- authenticationService = new MsaAuthenticationService(GeyserConnector.OAUTH_CLIENT_ID);
- } else {
- authenticationService = new MojangAuthenticationService();
- }
- authenticationService.setUsername(username);
- authenticationService.setPassword(password);
- authenticationService.login();
-
- GameProfile profile = authenticationService.getSelectedProfile();
- if (profile == null) {
- // Java account is offline
- disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
- return null;
- }
-
- protocol = new MinecraftProtocol(profile, authenticationService.getAccessToken());
- } else {
- // always replace spaces when using Floodgate,
- // as usernames with spaces cause issues with Bungeecord's login cycle.
- // However, this doesn't affect the final username as Floodgate is still in charge of that.
- // So if you have (for example) replace spaces enabled on Floodgate the spaces will re-appear.
- String validUsername = username;
- if (remoteAuthType == AuthType.FLOODGATE) {
- validUsername = username.replace(' ', '_');
- }
-
- protocol = new MinecraftProtocol(validUsername);
- }
- } catch (InvalidCredentialsException | IllegalArgumentException e) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.invalid", username));
- disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.invalid.kick", getClientData().getLanguageCode()));
- } catch (RequestException ex) {
- disconnect(ex.getMessage());
- }
- return null;
- }).whenComplete((aVoid, ex) -> {
- if (ex != null) {
- disconnect(ex.toString());
- }
- if (this.closed) {
- if (ex != null) {
- connector.getLogger().error("", ex);
- }
- // Client disconnected during the authentication attempt
- return;
- }
-
- connectDownstream();
- });
+ this.handle.authenticate(username, password);
}
- /**
- * Present a form window to the user asking to log in with another web browser
- */
public void authenticateWithMicrosoftCode() {
- if (loggedIn) {
- connector.getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.auth.already_loggedin", getAuthData().getName()));
- return;
- }
-
- loggingIn = true;
-
- // This just looks cool
- SetTimePacket packet = new SetTimePacket();
- packet.setTime(16000);
- sendUpstreamPacket(packet);
-
- // new thread so clients don't timeout
- MsaAuthenticationService msaAuthenticationService = new MsaAuthenticationService(GeyserConnector.OAUTH_CLIENT_ID);
-
- // Use a future to prevent timeouts as all the authentication is handled sync
- // This will be changed with the new protocol library.
- CompletableFuture.supplyAsync(() -> {
- try {
- return msaAuthenticationService.getAuthCode();
- } catch (RequestException e) {
- throw new CompletionException(e);
- }
- }).whenComplete((response, ex) -> {
- if (ex != null) {
- ex.printStackTrace();
- disconnect(ex.toString());
- return;
- }
- LoginEncryptionUtils.buildAndShowMicrosoftCodeWindow(this, response);
- attemptCodeAuthentication(msaAuthenticationService);
- });
- }
-
- /**
- * Poll every second to see if the user has successfully signed in
- */
- private void attemptCodeAuthentication(MsaAuthenticationService msaAuthenticationService) {
- if (loggedIn || closed) {
- return;
- }
- CompletableFuture.supplyAsync(() -> {
- try {
- msaAuthenticationService.login();
- GameProfile profile = msaAuthenticationService.getSelectedProfile();
- if (profile == null) {
- // Java account is offline
- disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
- return null;
- }
-
- return new MinecraftProtocol(profile, msaAuthenticationService.getAccessToken());
- } catch (RequestException e) {
- throw new CompletionException(e);
- }
- }).whenComplete((response, ex) -> {
- if (ex != null) {
- if (!(ex instanceof CompletionException completionException) || !(completionException.getCause() instanceof AuthPendingException)) {
- connector.getLogger().error("Failed to log in with Microsoft code!", ex);
- disconnect(ex.toString());
- } else {
- // Wait one second before trying again
- connector.getScheduledThread().schedule(() -> attemptCodeAuthentication(msaAuthenticationService), 1, TimeUnit.SECONDS);
- }
- return;
- }
- if (!closed) {
- this.protocol = response;
- connectDownstream();
- }
- });
- }
-
- /**
- * After getting whatever credentials needed, we attempt to join the Java server.
- */
- private void connectDownstream() {
- boolean floodgate = this.remoteAuthType == AuthType.FLOODGATE;
-
- // Start ticking
- tickThread = eventLoop.scheduleAtFixedRate(this::tick, 50, 50, TimeUnit.MILLISECONDS);
-
- if (connector.getBootstrap().getSocketAddress() != null) {
- // We're going to connect through the JVM and not through TCP
- downstream = new LocalSession(this.remoteAddress, this.remotePort,
- connector.getBootstrap().getSocketAddress(), upstream.getAddress().getAddress().getHostAddress(), this.protocol);
- } else {
- downstream = new TcpClientSession(this.remoteAddress, this.remotePort, this.protocol);
- disableSrvResolving();
- }
-
- if (connector.getConfig().getRemote().isUseProxyProtocol()) {
- downstream.setFlag(BuiltinFlags.ENABLE_CLIENT_PROXY_PROTOCOL, true);
- downstream.setFlag(BuiltinFlags.CLIENT_PROXIED_ADDRESS, upstream.getAddress());
- }
- if (connector.getConfig().isForwardPlayerPing()) {
- // Let Geyser handle sending the keep alive
- downstream.setFlag(MinecraftConstants.AUTOMATIC_KEEP_ALIVE_MANAGEMENT, false);
- }
- downstream.addListener(new SessionAdapter() {
- @Override
- public void packetSending(PacketSendingEvent event) {
- //todo move this somewhere else
- if (event.getPacket() instanceof ClientIntentionPacket) {
- String addressSuffix;
- if (floodgate) {
- byte[] encryptedData;
-
- try {
- FloodgateSkinUploader skinUploader = connector.getSkinUploader();
- FloodgateCipher cipher = connector.getCipher();
-
- encryptedData = cipher.encryptFromString(BedrockData.of(
- clientData.getGameVersion(),
- authData.getName(),
- authData.getXboxUUID(),
- clientData.getDeviceOs().ordinal(),
- clientData.getLanguageCode(),
- clientData.getUiProfile().ordinal(),
- clientData.getCurrentInputMode().ordinal(),
- upstream.getAddress().getAddress().getHostAddress(),
- skinUploader.getId(),
- skinUploader.getVerifyCode(),
- connector.getTimeSyncer()
- ).toString());
-
- if (!connector.getTimeSyncer().hasUsefulOffset()) {
- connector.getLogger().warning(
- "We couldn't make sure that your system clock is accurate. " +
- "This can cause issues with logging in."
- );
- }
-
- } catch (Exception e) {
- connector.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.encrypt_fail"), e);
- disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.floodgate.encryption_fail", getClientData().getLanguageCode()));
- return;
- }
-
- addressSuffix = '\0' + new String(encryptedData, StandardCharsets.UTF_8);
- } else {
- addressSuffix = "";
- }
-
- ClientIntentionPacket intentionPacket = event.getPacket();
-
- String address;
- if (connector.getConfig().getRemote().isForwardHost()) {
- address = clientData.getServerAddress().split(":")[0];
- } else {
- address = intentionPacket.getHostname();
- }
-
- event.setPacket(intentionPacket.withHostname(address + addressSuffix));
- }
- }
-
- @Override
- public void connected(ConnectedEvent event) {
- loggingIn = false;
- loggedIn = true;
-
- if (downstream instanceof LocalSession) {
- // Connected directly to the server
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect_internal",
- authData.getName(), protocol.getProfile().getName()));
- } else {
- // Connected to an IP address
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect",
- authData.getName(), protocol.getProfile().getName(), remoteAddress));
- }
-
- UUID uuid = protocol.getProfile().getId();
- if (uuid == null) {
- // Set what our UUID *probably* is going to be
- if (remoteAuthType == AuthType.FLOODGATE) {
- uuid = new UUID(0, Long.parseLong(authData.getXboxUUID()));
- } else {
- uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + protocol.getProfile().getName()).getBytes(StandardCharsets.UTF_8));
- }
- }
- playerEntity.setUuid(uuid);
- playerEntity.setUsername(protocol.getProfile().getName());
-
- String locale = clientData.getLanguageCode();
-
- // Let the user know there locale may take some time to download
- // as it has to be extracted from a JAR
- if (locale.equalsIgnoreCase("en_us") && !LocaleUtils.LOCALE_MAPPINGS.containsKey("en_us")) {
- // This should probably be left hardcoded as it will only show for en_us clients
- sendMessage("Loading your locale (en_us); if this isn't already downloaded, this may take some time");
- }
-
- // Download and load the language for the player
- LocaleUtils.downloadAndLoadLocale(locale);
- }
-
- @Override
- public void disconnected(DisconnectedEvent event) {
- loggingIn = false;
- loggedIn = false;
-
- String disconnectMessage;
- Throwable cause = event.getCause();
- if (cause instanceof UnexpectedEncryptionException) {
- if (remoteAuthType != AuthType.FLOODGATE) {
- // Server expects online mode
- disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.authentication_type_mismatch", getLocale());
- // Explain that they may be looking for Floodgate.
- connector.getLogger().warning(LanguageUtils.getLocaleStringLog(
- connector.getPlatformType() == PlatformType.STANDALONE ?
- "geyser.network.remote.floodgate_explanation_standalone"
- : "geyser.network.remote.floodgate_explanation_plugin",
- Constants.FLOODGATE_DOWNLOAD_LOCATION
- ));
- } else {
- // Likely that Floodgate is not configured correctly.
- disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.floodgate_login_error", getLocale());
- if (connector.getPlatformType() == PlatformType.STANDALONE) {
- connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.remote.floodgate_login_error_standalone"));
- }
- }
- } else if (cause instanceof ConnectException) {
- // Server is offline, probably
- disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.server_offline", getLocale());
- } else {
- disconnectMessage = MessageTranslator.convertMessageLenient(event.getReason());
- }
-
- if (downstream instanceof LocalSession) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.disconnect_internal", authData.getName(), disconnectMessage));
- } else {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.disconnect", authData.getName(), remoteAddress, disconnectMessage));
- }
- if (cause != null) {
- cause.printStackTrace();
- }
-
- upstream.disconnect(disconnectMessage);
- }
-
- @Override
- public void packetReceived(PacketReceivedEvent event) {
- Packet packet = event.getPacket();
- PacketTranslatorRegistry.JAVA_TRANSLATOR.translate(packet.getClass(), packet, GeyserSession.this);
- }
-
- @Override
- public void packetError(PacketErrorEvent event) {
- connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.downstream_error", event.getCause().getMessage()));
- if (connector.getConfig().isDebugMode())
- event.getCause().printStackTrace();
- event.setSuppress(true);
- }
- });
-
- if (!daylightCycle) {
- setDaylightCycle(true);
- }
-
- downstream.connect();
+ this.handle.authenticateWithMicrosoftCode();
}
public void disconnect(String reason) {
- if (!closed) {
- loggedIn = false;
- if (downstream != null) {
- downstream.disconnect(reason);
- }
- if (upstream != null && !upstream.isClosed()) {
- connector.getSessionManager().removeSession(this);
- upstream.disconnect(reason);
- }
- }
-
- if (tickThread != null) {
- tickThread.cancel(false);
- }
-
- closed = true;
+ this.handle.disconnect(reason);
}
public void close() {
- disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.close", getClientData().getLanguageCode()));
+ this.handle.close();
}
- /**
- * Executes a task and prints a stack trace if an error occurs.
- */
public void executeInEventLoop(Runnable runnable) {
- eventLoop.execute(() -> {
- try {
- runnable.run();
- } catch (Throwable e) {
- connector.getLogger().error("Error thrown in " + getName() + "'s event loop!", e);
- }
- });
+ this.handle.executeInEventLoop(runnable);
}
- /**
- * Schedules a task and prints a stack trace if an error occurs.
- */
- public ScheduledFuture scheduleInEventLoop(Runnable runnable, long duration, TimeUnit timeUnit) {
- return eventLoop.schedule(() -> {
- try {
- runnable.run();
- } catch (Throwable e) {
- connector.getLogger().error("Error thrown in " + getName() + "'s event loop!", e);
- }
- }, duration, timeUnit);
- }
-
- /**
- * Called every 50 milliseconds - one Minecraft tick.
- */
- protected void tick() {
- try {
- pistonCache.tick();
- // Check to see if the player's position needs updating - a position update should be sent once every 3 seconds
- if (spawned && (System.currentTimeMillis() - lastMovementTimestamp) > 3000) {
- // Recalculate in case something else changed position
- Vector3d position = collisionManager.adjustBedrockPosition(playerEntity.getPosition(), playerEntity.isOnGround(), false);
- // A null return value cancels the packet
- if (position != null) {
- ServerboundMovePlayerPosPacket packet = new ServerboundMovePlayerPosPacket(playerEntity.isOnGround(),
- position.getX(), position.getY(), position.getZ());
- sendDownstreamPacket(packet);
- }
- lastMovementTimestamp = System.currentTimeMillis();
- }
-
- if (worldBorder.isResizing()) {
- worldBorder.resize();
- }
-
- if (!worldBorder.isWithinWarningBoundaries()) {
- // Show particles representing where the world border is
- worldBorder.drawWall();
- // Set the mood
- if (!isInWorldBorderWarningArea) {
- isInWorldBorderWarningArea = true;
- WorldBorder.sendFog(this, "minecraft:fog_crimson_forest");
- }
- } else if (isInWorldBorderWarningArea) {
- // Clear fog as we are outside the world border now
- WorldBorder.removeFog(this);
- isInWorldBorderWarningArea = false;
- }
-
-
- for (Tickable entity : entityCache.getTickableEntities()) {
- entity.tick();
- }
- } catch (Throwable throwable) {
- throwable.printStackTrace();
- }
- }
-
- public void setAuthenticationData(AuthData authData) {
- this.authData = authData;
- }
-
- public void setSneaking(boolean sneaking) {
- this.sneaking = sneaking;
-
- // Update pose and bounding box on our end
- AttributeData speedAttribute;
- if (!sneaking && (speedAttribute = adjustSpeed()) != null) {
- // Update attributes since we're still "sneaking" under a 1.5-block-tall area
- UpdateAttributesPacket attributesPacket = new UpdateAttributesPacket();
- attributesPacket.setRuntimeEntityId(playerEntity.getGeyserId());
- attributesPacket.setAttributes(Collections.singletonList(speedAttribute));
- sendUpstreamPacket(attributesPacket);
- // the server *should* update our pose once it has returned to normal
- } else {
- if (!flying) {
- // The pose and bounding box should not be updated if the player is flying
- setSneakingPose(sneaking);
- }
- collisionManager.updateScaffoldingFlags(false);
- }
-
- playerEntity.updateBedrockMetadata();
-
- if (mouseoverEntity != null) {
- // Horses, etc can change their property depending on if you're sneaking
- InteractiveTagManager.updateTag(this, mouseoverEntity);
- }
- }
-
- private void setSneakingPose(boolean sneaking) {
- this.pose = sneaking ? Pose.SNEAKING : Pose.STANDING;
- playerEntity.getDirtyMetadata().put(EntityData.BOUNDING_BOX_HEIGHT, sneaking ? 1.5f : playerEntity.getDefinition().height());
- playerEntity.setFlag(EntityFlag.SNEAKING, sneaking);
-
- collisionManager.updatePlayerBoundingBox();
- }
-
- public void setSwimming(boolean swimming) {
- this.pose = swimming ? Pose.SWIMMING : Pose.STANDING;
- playerEntity.getDirtyMetadata().put(EntityData.BOUNDING_BOX_HEIGHT, swimming ? 0.6f : playerEntity.getDefinition().height());
- playerEntity.setFlag(EntityFlag.SWIMMING, swimming);
- playerEntity.updateBedrockMetadata();
- }
-
- public void setFlying(boolean flying) {
- this.flying = flying;
-
- if (sneaking) {
- // update bounding box as it is not reduced when flying
- setSneakingPose(!flying);
- playerEntity.updateBedrockMetadata();
- }
- }
-
- /**
- * Adjusts speed if the player is crawling.
- *
- * @return not null if attributes should be updated.
- */
- public AttributeData adjustSpeed() {
- AttributeData currentPlayerSpeed = playerEntity.getAttributes().get(GeyserAttributeType.MOVEMENT_SPEED);
- if (currentPlayerSpeed != null) {
- if ((pose.equals(Pose.SNEAKING) && !sneaking && collisionManager.isUnderSlab()) ||
- (!swimmingInWater && playerEntity.getFlag(EntityFlag.SWIMMING) && !collisionManager.isPlayerInWater())) {
- // Either of those conditions means that Bedrock goes zoom when they shouldn't be
- AttributeData speedAttribute = GeyserAttributeType.MOVEMENT_SPEED.getAttribute(originalSpeedAttribute / 3.32f);
- playerEntity.getAttributes().put(GeyserAttributeType.MOVEMENT_SPEED, speedAttribute);
- return speedAttribute;
- } else if (originalSpeedAttribute != currentPlayerSpeed.getValue()) {
- // Speed has reset to normal
- AttributeData speedAttribute = GeyserAttributeType.MOVEMENT_SPEED.getAttribute(originalSpeedAttribute);
- playerEntity.getAttributes().put(GeyserAttributeType.MOVEMENT_SPEED, speedAttribute);
- return speedAttribute;
- }
- }
- return null;
- }
-
- /**
- * Will be overwritten for GeyserConnect.
- */
- protected void disableSrvResolving() {
- this.downstream.setFlag(BuiltinFlags.ATTEMPT_SRV_RESOLVE, false);
- }
-
- @Override
public String getName() {
- return authData.getName();
+ return this.handle.getName();
}
- @Override
- public void sendMessage(String message) {
- TextPacket textPacket = new TextPacket();
- textPacket.setPlatformChatId("");
- textPacket.setSourceName("");
- textPacket.setXuid("");
- textPacket.setType(TextPacket.Type.CHAT);
- textPacket.setNeedsTranslation(false);
- textPacket.setMessage(message);
-
- upstream.sendPacket(textPacket);
- }
-
- @Override
public boolean isConsole() {
- return false;
+ return this.handle.isConsole();
}
- @Override
public String getLocale() {
- return clientData.getLanguageCode();
- }
-
- public void setRenderDistance(int renderDistance) {
- renderDistance = GenericMath.ceil(++renderDistance * MathUtils.SQRT_OF_TWO); //square to circle
- this.renderDistance = renderDistance;
-
- ChunkRadiusUpdatedPacket chunkRadiusUpdatedPacket = new ChunkRadiusUpdatedPacket();
- chunkRadiusUpdatedPacket.setRadius(renderDistance);
- upstream.sendPacket(chunkRadiusUpdatedPacket);
+ return this.handle.getLocale();
}
- public InetSocketAddress getSocketAddress() {
- return this.upstream.getAddress();
- }
-
- public void sendForm(Form form) {
- formCache.showForm(form);
- }
-
- public void sendForm(FormBuilder formBuilder) {
- formCache.showForm(formBuilder.build());
- }
-
- private void startGame() {
- StartGamePacket startGamePacket = new StartGamePacket();
- startGamePacket.setUniqueEntityId(playerEntity.getGeyserId());
- startGamePacket.setRuntimeEntityId(playerEntity.getGeyserId());
- startGamePacket.setPlayerGameType(switch (gameMode) {
- case CREATIVE -> GameType.CREATIVE;
- case ADVENTURE -> GameType.ADVENTURE;
- default -> GameType.SURVIVAL;
- });
- startGamePacket.setPlayerPosition(Vector3f.from(0, 69, 0));
- startGamePacket.setRotation(Vector2f.from(1, 1));
-
- startGamePacket.setSeed(-1);
- startGamePacket.setDimensionId(DimensionUtils.javaToBedrock(dimension));
- startGamePacket.setGeneratorId(1);
- startGamePacket.setLevelGameType(GameType.SURVIVAL);
- startGamePacket.setDifficulty(1);
- startGamePacket.setDefaultSpawn(Vector3i.ZERO);
- startGamePacket.setAchievementsDisabled(!connector.getConfig().isXboxAchievementsEnabled());
- startGamePacket.setCurrentTick(-1);
- startGamePacket.setEduEditionOffers(0);
- startGamePacket.setEduFeaturesEnabled(false);
- startGamePacket.setRainLevel(0);
- startGamePacket.setLightningLevel(0);
- startGamePacket.setMultiplayerGame(true);
- startGamePacket.setBroadcastingToLan(true);
- startGamePacket.setPlatformBroadcastMode(GamePublishSetting.PUBLIC);
- startGamePacket.setXblBroadcastMode(GamePublishSetting.PUBLIC);
- startGamePacket.setCommandsEnabled(!connector.getConfig().isXboxAchievementsEnabled());
- startGamePacket.setTexturePacksRequired(false);
- startGamePacket.setBonusChestEnabled(false);
- startGamePacket.setStartingWithMap(false);
- startGamePacket.setTrustingPlayers(true);
- startGamePacket.setDefaultPlayerPermission(PlayerPermission.MEMBER);
- startGamePacket.setServerChunkTickRange(4);
- startGamePacket.setBehaviorPackLocked(false);
- startGamePacket.setResourcePackLocked(false);
- startGamePacket.setFromLockedWorldTemplate(false);
- startGamePacket.setUsingMsaGamertagsOnly(false);
- startGamePacket.setFromWorldTemplate(false);
- startGamePacket.setWorldTemplateOptionLocked(false);
-
- String serverName = connector.getConfig().getBedrock().getServerName();
- startGamePacket.setLevelId(serverName);
- startGamePacket.setLevelName(serverName);
-
- startGamePacket.setPremiumWorldTemplateId("00000000-0000-0000-0000-000000000000");
- // startGamePacket.setCurrentTick(0);
- startGamePacket.setEnchantmentSeed(0);
- startGamePacket.setMultiplayerCorrelationId("");
- startGamePacket.setItemEntries(this.itemMappings.getItemEntries());
- startGamePacket.setVanillaVersion("*");
- startGamePacket.setInventoriesServerAuthoritative(true);
- startGamePacket.setServerEngine(""); // Do we want to fill this in?
-
- SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings();
- settings.setMovementMode(AuthoritativeMovementMode.CLIENT);
- settings.setRewindHistorySize(0);
- settings.setServerAuthoritativeBlockBreaking(false);
- startGamePacket.setPlayerMovementSettings(settings);
-
- if (upstream.getProtocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) {
- startGamePacket.getExperiments().add(new ExperimentData("caves_and_cliffs", true));
- }
-
- upstream.sendPacket(startGamePacket);
- }
-
- /**
- * @return the next Bedrock item network ID to use for a new item
- */
- public int getNextItemNetId() {
- return itemNetId.getAndIncrement();
- }
-
- public void addTeleport(TeleportCache teleportCache) {
- teleportMap.put(teleportCache.getTeleportConfirmId(), teleportCache);
-
- ObjectIterator> it = teleportMap.int2ObjectEntrySet().iterator();
-
- // Remove any teleports with a higher number - maybe this is a world change that reset the ID to 0?
- while (it.hasNext()) {
- Int2ObjectMap.Entry entry = it.next();
- int nextID = entry.getValue().getTeleportConfirmId();
- if (nextID > teleportCache.getTeleportConfirmId()) {
- it.remove();
- }
- }
- }
-
- public void confirmTeleport(Vector3d position) {
- if (teleportMap.size() == 0) {
- return;
- }
- int teleportID = -1;
-
- for (Int2ObjectMap.Entry entry : teleportMap.int2ObjectEntrySet()) {
- if (entry.getValue().canConfirm(position)) {
- if (entry.getValue().getTeleportConfirmId() > teleportID) {
- teleportID = entry.getValue().getTeleportConfirmId();
- }
- }
- }
-
- if (teleportID != -1) {
- ObjectIterator> it = teleportMap.int2ObjectEntrySet().iterator();
-
- // Confirm the current teleport and any earlier ones
- while (it.hasNext()) {
- TeleportCache entry = it.next().getValue();
- int nextID = entry.getTeleportConfirmId();
- if (nextID <= teleportID) {
- ServerboundAcceptTeleportationPacket teleportConfirmPacket = new ServerboundAcceptTeleportationPacket(nextID);
- sendDownstreamPacket(teleportConfirmPacket);
- // Servers (especially ones like Hypixel) expect exact coordinates given back to them.
- ServerboundMovePlayerPosRotPacket positionPacket = new ServerboundMovePlayerPosRotPacket(playerEntity.isOnGround(),
- entry.getX(), entry.getY(), entry.getZ(), entry.getYaw(), entry.getPitch());
- sendDownstreamPacket(positionPacket);
- it.remove();
- connector.getLogger().debug("Confirmed teleport " + nextID);
- }
- }
- }
-
- if (teleportMap.size() > 0) {
- int resendID = -1;
- for (Int2ObjectMap.Entry entry : teleportMap.int2ObjectEntrySet()) {
- TeleportCache teleport = entry.getValue();
- teleport.incrementUnconfirmedFor();
- if (teleport.shouldResend()) {
- if (teleport.getTeleportConfirmId() >= resendID) {
- resendID = teleport.getTeleportConfirmId();
- }
- }
- }
-
- if (resendID != -1) {
- connector.getLogger().debug("Resending teleport " + resendID);
- TeleportCache teleport = teleportMap.get(resendID);
- getPlayerEntity().moveAbsolute(Vector3f.from(teleport.getX(), teleport.getY(), teleport.getZ()),
- teleport.getYaw(), teleport.getPitch(), playerEntity.isOnGround(), true);
- }
- }
- }
-
- /**
- * Queue a packet to be sent to player.
- *
- * @param packet the bedrock packet from the NukkitX protocol lib
- */
public void sendUpstreamPacket(BedrockPacket packet) {
- upstream.sendPacket(packet);
+ this.handle.sendUpstreamPacket(packet);
}
- /**
- * Send a packet immediately to the player.
- *
- * @param packet the bedrock packet from the NukkitX protocol lib
- */
public void sendUpstreamPacketImmediately(BedrockPacket packet) {
- upstream.sendPacketImmediately(packet);
+ this.handle.sendUpstreamPacketImmediately(packet);
}
- /**
- * Send a packet to the remote server.
- *
- * @param packet the java edition packet from MCProtocolLib
- */
public void sendDownstreamPacket(Packet packet) {
- if (!closed && this.downstream != null) {
- Channel channel = this.downstream.getChannel();
- if (channel == null) {
- // Channel is only null before the connection has initialized
- connector.getLogger().warning("Tried to send a packet to the Java server too early!");
- if (connector.getConfig().isDebugMode()) {
- Thread.dumpStack();
- }
- return;
- }
-
- EventLoop eventLoop = channel.eventLoop();
- if (eventLoop.inEventLoop()) {
- sendDownstreamPacket0(packet);
- } else {
- eventLoop.execute(() -> sendDownstreamPacket0(packet));
- }
- }
+ this.handle.sendDownstreamPacket(packet);
}
- private void sendDownstreamPacket0(Packet packet) {
- if (protocol.getState().equals(ProtocolState.GAME) || packet.getClass() == ServerboundCustomQueryPacket.class) {
- downstream.send(packet);
- } else {
- connector.getLogger().debug("Tried to send downstream packet " + packet.getClass().getSimpleName() + " before connected to the server");
- }
- }
-
- /**
- * Update the cached value for the reduced debug info gamerule.
- * If enabled, also hides the player's coordinates.
- *
- * @param value The new value for reducedDebugInfo
- */
- public void setReducedDebugInfo(boolean value) {
- reducedDebugInfo = value;
- // Set the showCoordinates data. This is done because updateShowCoordinates() uses this gamerule as a variable.
- preferencesCache.updateShowCoordinates();
- }
-
- /**
- * Changes the daylight cycle gamerule on the client
- * This is used in the login screen along-side normal usage
- *
- * @param doCycle If the cycle should continue
- */
- public void setDaylightCycle(boolean doCycle) {
- sendGameRule("dodaylightcycle", doCycle);
- // Save the value so we don't have to constantly send a daylight cycle gamerule update
- this.daylightCycle = doCycle;
- }
-
- /**
- * Send a gamerule value to the client
- *
- * @param gameRule The gamerule to send
- * @param value The value of the gamerule
- */
- public void sendGameRule(String gameRule, Object value) {
- GameRulesChangedPacket gameRulesChangedPacket = new GameRulesChangedPacket();
- gameRulesChangedPacket.getGameRules().add(new GameRuleData<>(gameRule, value));
- upstream.sendPacket(gameRulesChangedPacket);
- }
-
- /**
- * Checks if the given session's player has a permission
- *
- * @param permission The permission node to check
- * @return true if the player has the requested permission, false if not
- */
- @Override
public boolean hasPermission(String permission) {
- return connector.getWorldManager().hasPermission(this, permission);
+ return this.handle.hasPermission(permission);
}
- /**
- * Send an AdventureSettingsPacket to the client with the latest flags
- */
public void sendAdventureSettings() {
- AdventureSettingsPacket adventureSettingsPacket = new AdventureSettingsPacket();
- adventureSettingsPacket.setUniqueEntityId(playerEntity.getGeyserId());
- // Set command permission if OP permission level is high enough
- // This allows mobile players access to a GUI for doing commands. The commands there do not change above OPERATOR
- // and all commands there are accessible with OP permission level 2
- adventureSettingsPacket.setCommandPermission(opPermissionLevel >= 2 ? CommandPermission.OPERATOR : CommandPermission.NORMAL);
- // Required to make command blocks destroyable
- adventureSettingsPacket.setPlayerPermission(opPermissionLevel >= 2 ? PlayerPermission.OPERATOR : PlayerPermission.MEMBER);
-
- // Update the noClip and worldImmutable values based on the current gamemode
- boolean spectator = gameMode == GameMode.SPECTATOR;
- boolean worldImmutable = gameMode == GameMode.ADVENTURE || spectator;
-
- Set flags = adventureSettingsPacket.getSettings();
- if (canFly || spectator) {
- flags.add(AdventureSetting.MAY_FLY);
- }
-
- if (flying || spectator) {
- if (spectator && !flying) {
- // We're "flying locked" in this gamemode
- flying = true;
- ServerboundPlayerAbilitiesPacket abilitiesPacket = new ServerboundPlayerAbilitiesPacket(true);
- sendDownstreamPacket(abilitiesPacket);
- }
- flags.add(AdventureSetting.FLYING);
- }
-
- if (worldImmutable) {
- flags.add(AdventureSetting.WORLD_IMMUTABLE);
- }
-
- if (spectator) {
- flags.add(AdventureSetting.NO_CLIP);
- }
-
- flags.add(AdventureSetting.AUTO_JUMP);
-
- sendUpstreamPacket(adventureSettingsPacket);
- }
-
- /**
- * Used for updating statistic values since we only get changes from the server
- *
- * @param statistics Updated statistics values
- */
- public void updateStatistics(@NonNull Map statistics) {
- this.statistics.putAll(statistics);
- }
-
- public void refreshEmotes(List emotes) {
- this.emotes.addAll(emotes);
- for (GeyserSession player : connector.getSessionManager().getSessions().values()) {
- List pieces = new ArrayList<>();
- for (UUID piece : emotes) {
- if (!player.getEmotes().contains(piece)) {
- pieces.add(piece);
- }
- player.getEmotes().add(piece);
- }
- EmoteListPacket emoteList = new EmoteListPacket();
- emoteList.setRuntimeEntityId(player.getPlayerEntity().getGeyserId());
- emoteList.getPieceIds().addAll(pieces);
- player.sendUpstreamPacket(emoteList);
- }
+ this.handle.sendAdventureSettings();
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java b/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java
index 463276891..d1871d4c3 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java
+++ b/core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java
@@ -25,26 +25,30 @@
package org.geysermc.connector.network.session.auth;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-
import java.util.UUID;
-@RequiredArgsConstructor
+/**
+ * Deprecated, legacy code. Serves as a wrapper around
+ * the class used now.
+ *
+ * @deprecated legacy code
+ */
public class AuthData {
- @Getter private final String name;
- @Getter private final UUID UUID;
- @Getter private final String xboxUUID;
+ private final org.geysermc.geyser.network.session.auth.AuthData handle;
- private final JsonNode certChainData;
- private final String clientData;
+ public AuthData(org.geysermc.geyser.network.session.auth.AuthData handle) {
+ this.handle = handle;
+ }
- public void upload(GeyserConnector connector) {
- // we can't upload the skin in LoginEncryptionUtil since the global server would return
- // the skin too fast, that's why we upload it after we know for sure that the target server
- // is ready to handle the result of the global server
- connector.getSkinUploader().uploadSkin(certChainData, clientData);
+ public String getName() {
+ return this.handle.getName();
+ }
+
+ public UUID getUUID() {
+ return this.handle.getUuid();
+ }
+
+ public String getXboxUUID() {
+ return this.handle.getXuid();
}
}
diff --git a/core/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java b/core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java
rename to core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java
index 74335dc7d..de0797fc1 100644
--- a/core/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java
@@ -23,11 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector;
+package org.geysermc.geyser;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.configuration.GeyserJacksonConfiguration;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.configuration.GeyserJacksonConfiguration;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
new file mode 100644
index 000000000..3efa35f1f
--- /dev/null
+++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -0,0 +1,502 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.steveice10.packetlib.tcp.TcpSession;
+import com.nukkitx.network.raknet.RakNetConstants;
+import com.nukkitx.network.util.EventLoops;
+import com.nukkitx.protocol.bedrock.BedrockServer;
+import io.netty.channel.epoll.Epoll;
+import io.netty.channel.kqueue.KQueue;
+import io.netty.util.NettyRuntime;
+import io.netty.util.concurrent.DefaultThreadFactory;
+import io.netty.util.internal.SystemPropertyUtil;
+import lombok.Getter;
+import lombok.Setter;
+import org.geysermc.common.PlatformType;
+import org.geysermc.geyser.api.Geyser;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.bootstrap.GeyserBootstrap;
+import org.geysermc.geyser.command.CommandManager;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.metrics.Metrics;
+import org.geysermc.geyser.network.ConnectorServerEventHandler;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslatorRegistry;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.network.translators.world.WorldManager;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.scoreboard.ScoreboardUpdater;
+import org.geysermc.geyser.skin.FloodgateSkinUploader;
+import org.geysermc.geyser.utils.*;
+import org.geysermc.floodgate.crypto.AesCipher;
+import org.geysermc.floodgate.crypto.AesKeyProducer;
+import org.geysermc.floodgate.crypto.Base64Topping;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
+import org.geysermc.floodgate.news.NewsItemAction;
+import org.geysermc.floodgate.time.TimeSyncer;
+import org.jetbrains.annotations.Contract;
+
+import javax.naming.directory.Attribute;
+import javax.naming.directory.InitialDirContext;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.security.Key;
+import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Getter
+public class GeyserImpl extends Geyser {
+ public static final ObjectMapper JSON_MAPPER = new ObjectMapper()
+ .enable(JsonParser.Feature.IGNORE_UNDEFINED)
+ .enable(JsonParser.Feature.ALLOW_COMMENTS)
+ .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+ .enable(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES)
+ .enable(JsonParser.Feature.ALLOW_SINGLE_QUOTES);
+
+ public static final String NAME = "Geyser";
+ public static final String GIT_VERSION = "DEV"; // A fallback for running in IDEs
+ public static final String VERSION = "DEV"; // A fallback for running in IDEs
+
+ /**
+ * Oauth client ID for Microsoft authentication
+ */
+ public static final String OAUTH_CLIENT_ID = "204cefd1-4818-4de1-b98d-513fae875d88";
+
+ private static final String IP_REGEX = "\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b";
+
+ private final SessionManager sessionManager = new SessionManager();
+
+ /**
+ * This is used in GeyserConnect to stop the bedrock server binding to a port
+ */
+ @Setter
+ private static boolean shouldStartListener = true;
+
+ private final TimeSyncer timeSyncer;
+ private FloodgateCipher cipher;
+ private FloodgateSkinUploader skinUploader;
+ private final NewsHandler newsHandler;
+
+ private volatile boolean shuttingDown = false;
+
+ private final ScheduledExecutorService scheduledThread;
+
+ private final BedrockServer bedrockServer;
+ private final PlatformType platformType;
+ private final GeyserBootstrap bootstrap;
+
+ private final Metrics metrics;
+
+ private GeyserImpl(PlatformType platformType, GeyserBootstrap bootstrap) {
+ long startupTime = System.currentTimeMillis();
+
+ Geyser.setInstance(this);
+
+ this.bootstrap = bootstrap;
+
+ GeyserLogger logger = bootstrap.getGeyserLogger();
+ GeyserConfiguration config = bootstrap.getGeyserConfig();
+
+ this.platformType = platformType;
+
+ logger.info("******************************************");
+ logger.info("");
+ logger.info(LanguageUtils.getLocaleStringLog("geyser.core.load", NAME, VERSION));
+ logger.info("");
+ logger.info("******************************************");
+
+ this.scheduledThread = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("Geyser Scheduled Thread"));
+
+ logger.setDebug(config.isDebugMode());
+
+ PacketTranslatorRegistry.init();
+
+ /* Initialize translators and registries */
+ BlockRegistries.init();
+ Registries.init();
+
+ EntityDefinitions.init();
+ ItemTranslator.init();
+ MessageTranslator.init();
+ LocaleUtils.init();
+ ScoreboardUpdater.init();
+
+ ResourcePack.loadPacks();
+
+ if (platformType != PlatformType.STANDALONE && config.getRemote().getAddress().equals("auto")) {
+ // Set the remote address to localhost since that is where we are always connecting
+ try {
+ config.getRemote().setAddress(InetAddress.getLocalHost().getHostAddress());
+ } catch (UnknownHostException ex) {
+ logger.debug("Unknown host when trying to find localhost.");
+ if (config.isDebugMode()) {
+ ex.printStackTrace();
+ }
+ config.getRemote().setAddress(InetAddress.getLoopbackAddress().getHostAddress());
+ }
+ }
+ String remoteAddress = config.getRemote().getAddress();
+ // Filters whether it is not an IP address or localhost, because otherwise it is not possible to find out an SRV entry.
+ if (!remoteAddress.matches(IP_REGEX) && !remoteAddress.equalsIgnoreCase("localhost")) {
+ int remotePort;
+ try {
+ // Searches for a server address and a port from a SRV record of the specified host name
+ InitialDirContext ctx = new InitialDirContext();
+ Attribute attr = ctx.getAttributes("dns:///_minecraft._tcp." + remoteAddress, new String[]{"SRV"}).get("SRV");
+ // size > 0 = SRV entry found
+ if (attr != null && attr.size() > 0) {
+ String[] record = ((String) attr.get(0)).split(" ");
+ // Overwrites the existing address and port with that from the SRV record.
+ config.getRemote().setAddress(remoteAddress = record[3]);
+ config.getRemote().setPort(remotePort = Integer.parseInt(record[2]));
+ logger.debug("Found SRV record \"" + remoteAddress + ":" + remotePort + "\"");
+ }
+ } catch (Exception | NoClassDefFoundError ex) { // Check for a NoClassDefFoundError to prevent Android crashes
+ logger.debug("Exception while trying to find an SRV record for the remote host.");
+ if (config.isDebugMode())
+ ex.printStackTrace(); // Otherwise we can get a stack trace for any domain that doesn't have an SRV record
+ }
+ }
+
+ // Ensure that PacketLib does not create an event loop for handling packets; we'll do that ourselves
+ TcpSession.USE_EVENT_LOOP_FOR_PACKETS = false;
+
+ TimeSyncer timeSyncer = null;
+ if (config.getRemote().getAuthType() == AuthType.FLOODGATE) {
+ timeSyncer = new TimeSyncer(Constants.NTP_SERVER);
+ try {
+ Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath());
+ cipher = new AesCipher(new Base64Topping());
+ cipher.init(key);
+ logger.info(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.loaded_key"));
+ skinUploader = new FloodgateSkinUploader(this).start();
+ } catch (Exception exception) {
+ logger.severe(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.bad_key"), exception);
+ }
+ }
+ this.timeSyncer = timeSyncer;
+
+ String branch = "unknown";
+ int buildNumber = -1;
+ if (this.isProductionEnvironment()) {
+ try {
+ Properties gitProperties = new Properties();
+ gitProperties.load(FileUtils.getResource("git.properties"));
+ branch = gitProperties.getProperty("git.branch");
+ String build = gitProperties.getProperty("git.build.number");
+ if (build != null) {
+ buildNumber = Integer.parseInt(build);
+ }
+ } catch (Throwable e) {
+ logger.error("Failed to read git.properties", e);
+ }
+ } else {
+ logger.debug("Not getting git properties for the news handler as we are in a development environment.");
+ }
+ newsHandler = new NewsHandler(branch, buildNumber);
+
+ CooldownUtils.setDefaultShowCooldown(config.getShowCooldown());
+ DimensionUtils.changeBedrockNetherId(config.isAboveBedrockNetherBuilding()); // Apply End dimension ID workaround to Nether
+
+ // https://github.com/GeyserMC/Geyser/issues/957
+ RakNetConstants.MAXIMUM_MTU_SIZE = (short) config.getMtu();
+ logger.debug("Setting MTU to " + config.getMtu());
+
+ Integer bedrockThreadCount = Integer.getInteger("Geyser.BedrockNetworkThreads");
+ if (bedrockThreadCount == null) {
+ // Copy the code from Netty's default thread count fallback
+ bedrockThreadCount = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads", NettyRuntime.availableProcessors() * 2));
+ }
+
+ boolean enableProxyProtocol = config.getBedrock().isEnableProxyProtocol();
+ bedrockServer = new BedrockServer(
+ new InetSocketAddress(config.getBedrock().getAddress(), config.getBedrock().getPort()),
+ bedrockThreadCount,
+ EventLoops.commonGroup(),
+ enableProxyProtocol
+ );
+
+ if (config.isDebugMode()) {
+ logger.debug("EventLoop type: " + EventLoops.getChannelType());
+ if (EventLoops.getChannelType() == EventLoops.ChannelType.NIO) {
+ if (System.getProperties().contains("disableNativeEventLoop")) {
+ logger.debug("EventLoop type is NIO because native event loops are disabled.");
+ } else {
+ logger.debug("Reason for no Epoll: " + Epoll.unavailabilityCause().toString());
+ logger.debug("Reason for no KQueue: " + KQueue.unavailabilityCause().toString());
+ }
+ }
+ }
+
+ bedrockServer.setHandler(new ConnectorServerEventHandler(this));
+
+ if (shouldStartListener) {
+ bedrockServer.bind().whenComplete((avoid, throwable) -> {
+ if (throwable == null) {
+ logger.info(LanguageUtils.getLocaleStringLog("geyser.core.start", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
+ } else {
+ logger.severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
+ throwable.printStackTrace();
+ }
+ }).join();
+ }
+
+ if (config.getMetrics().isEnabled()) {
+ metrics = new Metrics(this, "GeyserMC", config.getMetrics().getUniqueId(), false, java.util.logging.Logger.getLogger(""));
+ metrics.addCustomChart(new Metrics.SingleLineChart("players", sessionManager::size));
+ // Prevent unwanted words best we can
+ metrics.addCustomChart(new Metrics.SimplePie("authMode", () -> config.getRemote().getAuthType().toString().toLowerCase()));
+ metrics.addCustomChart(new Metrics.SimplePie("platform", platformType::getPlatformName));
+ metrics.addCustomChart(new Metrics.SimplePie("defaultLocale", LanguageUtils::getDefaultLocale));
+ metrics.addCustomChart(new Metrics.SimplePie("version", () -> GeyserImpl.VERSION));
+ metrics.addCustomChart(new Metrics.AdvancedPie("playerPlatform", () -> {
+ Map valueMap = new HashMap<>();
+ for (GeyserSession session : sessionManager.getAllSessions()) {
+ if (session == null) continue;
+ if (session.getClientData() == null) continue;
+ String os = session.getClientData().getDeviceOs().toString();
+ if (!valueMap.containsKey(os)) {
+ valueMap.put(os, 1);
+ } else {
+ valueMap.put(os, valueMap.get(os) + 1);
+ }
+ }
+ return valueMap;
+ }));
+ metrics.addCustomChart(new Metrics.AdvancedPie("playerVersion", () -> {
+ Map valueMap = new HashMap<>();
+ for (GeyserSession session : sessionManager.getAllSessions()) {
+ if (session == null) continue;
+ if (session.getClientData() == null) continue;
+ String version = session.getClientData().getGameVersion();
+ if (!valueMap.containsKey(version)) {
+ valueMap.put(version, 1);
+ } else {
+ valueMap.put(version, valueMap.get(version) + 1);
+ }
+ }
+ return valueMap;
+ }));
+
+ String minecraftVersion = bootstrap.getMinecraftServerVersion();
+ if (minecraftVersion != null) {
+ Map> versionMap = new HashMap<>();
+ Map platformMap = new HashMap<>();
+ platformMap.put(platformType.getPlatformName(), 1);
+ versionMap.put(minecraftVersion, platformMap);
+
+ metrics.addCustomChart(new Metrics.DrilldownPie("minecraftServerVersion", () -> {
+ // By the end, we should return, for example:
+ // 1.16.5 => (Spigot, 1)
+ return versionMap;
+ }));
+ }
+
+ // The following code can be attributed to the PaperMC project
+ // https://github.com/PaperMC/Paper/blob/master/Spigot-Server-Patches/0005-Paper-Metrics.patch#L614
+ metrics.addCustomChart(new Metrics.DrilldownPie("javaVersion", () -> {
+ Map> map = new HashMap<>();
+ String javaVersion = System.getProperty("java.version");
+ Map entry = new HashMap<>();
+ entry.put(javaVersion, 1);
+
+ // http://openjdk.java.net/jeps/223
+ // Java decided to change their versioning scheme and in doing so modified the
+ // java.version system property to return $major[.$minor][.$security][-ea], as opposed to
+ // 1.$major.0_$identifier we can handle pre-9 by checking if the "major" is equal to "1",
+ // otherwise, 9+
+ String majorVersion = javaVersion.split("\\.")[0];
+ String release;
+
+ int indexOf = javaVersion.lastIndexOf('.');
+
+ if (majorVersion.equals("1")) {
+ release = "Java " + javaVersion.substring(0, indexOf);
+ } else {
+ // of course, it really wouldn't be all that simple if they didn't add a quirk, now
+ // would it valid strings for the major may potentially include values such as -ea to
+ // denote a pre release
+ Matcher versionMatcher = Pattern.compile("\\d+").matcher(majorVersion);
+ if (versionMatcher.find()) {
+ majorVersion = versionMatcher.group(0);
+ }
+ release = "Java " + majorVersion;
+ }
+ map.put(release, entry);
+ return map;
+ }));
+ } else {
+ metrics = null;
+ }
+
+ boolean isGui = false;
+ // This will check if we are in standalone and get the 'useGui' variable from there
+ if (platformType == PlatformType.STANDALONE) {
+ try {
+ Class cls = Class.forName("org.geysermc.geyser.platform.standalone.GeyserStandaloneBootstrap");
+ isGui = (boolean) cls.getMethod("isUseGui").invoke(cls.cast(bootstrap));
+ } catch (Exception e) {
+ logger.debug("Failed detecting if standalone is using a GUI; if this is a GeyserConnect instance this can be safely ignored.");
+ }
+ }
+
+ double completeTime = (System.currentTimeMillis() - startupTime) / 1000D;
+ String message = LanguageUtils.getLocaleStringLog("geyser.core.finish.done", new DecimalFormat("#.###").format(completeTime)) + " ";
+ if (isGui) {
+ message += LanguageUtils.getLocaleStringLog("geyser.core.finish.gui");
+ } else {
+ message += LanguageUtils.getLocaleStringLog("geyser.core.finish.console");
+ }
+ logger.info(message);
+
+ if (platformType == PlatformType.STANDALONE) {
+ logger.warning(LanguageUtils.getLocaleStringLog("geyser.core.movement_warn"));
+ }
+
+ newsHandler.handleNews(null, NewsItemAction.ON_SERVER_STARTED);
+ }
+
+ public void shutdown() {
+ bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown"));
+ shuttingDown = true;
+
+ if (sessionManager.size() >= 1) {
+ bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.log", sessionManager.size()));
+ sessionManager.disconnectAll("geyser.core.shutdown.kick.message");
+ bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.done"));
+ }
+
+ scheduledThread.shutdown();
+ bedrockServer.close();
+ if (timeSyncer != null) {
+ timeSyncer.shutdown();
+ }
+ if (skinUploader != null) {
+ skinUploader.close();
+ }
+ newsHandler.shutdown();
+ this.getCommandManager().getCommands().clear();
+
+ bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.done"));
+ }
+
+ /**
+ * Gets a player by their current UUID
+ *
+ * @param uuid the uuid
+ * @return the player or null if there is no player online with this UUID
+ */
+ @Contract("null -> null")
+ public GeyserSession getPlayerByUuid(UUID uuid) {
+ if (uuid == null) {
+ return null;
+ }
+
+ return sessionManager.getSessions().get(uuid);
+ }
+
+ /**
+ * Gets a player by their Xbox user identifier
+ *
+ * @param xuid the Xbox user identifier
+ * @return the player or null if there is no player online with this xuid
+ */
+ @SuppressWarnings("unused") // API usage
+ public GeyserSession getPlayerByXuid(String xuid) {
+ for (GeyserSession session : sessionManager.getPendingSessions()) {
+ if (session.getAuthData().getXuid().equals(xuid)) {
+ return session;
+ }
+ }
+ for (GeyserSession session : sessionManager.getSessions().values()) {
+ if (session.getAuthData().getXuid().equals(xuid)) {
+ return session;
+ }
+ }
+
+ return null;
+ }
+
+ public static GeyserImpl start(PlatformType platformType, GeyserBootstrap bootstrap) {
+ return new GeyserImpl(platformType, bootstrap);
+ }
+
+ public void reload() {
+ shutdown();
+ bootstrap.onEnable();
+ }
+
+ public GeyserLogger getLogger() {
+ return bootstrap.getGeyserLogger();
+ }
+
+ public GeyserConfiguration getConfig() {
+ return bootstrap.getGeyserConfig();
+ }
+
+ public CommandManager getCommandManager() {
+ return bootstrap.getGeyserCommandManager();
+ }
+
+ public WorldManager getWorldManager() {
+ return bootstrap.getWorldManager();
+ }
+
+ public TimeSyncer getTimeSyncer() {
+ return timeSyncer;
+ }
+
+ /**
+ * Returns false if this Geyser instance is running in an IDE. This only needs to be used in cases where files
+ * expected to be in a jarfile are not present.
+ *
+ * @return true if the version number is not 'DEV'.
+ */
+ public boolean isProductionEnvironment() {
+ //noinspection ConstantConditions - changes in production
+ return !"DEV".equals(GeyserImpl.VERSION);
+ }
+
+ public static GeyserImpl getInstance() {
+ return (GeyserImpl) Geyser.getInstance();
+ }
+}
diff --git a/core/src/main/java/org/geysermc/connector/SessionManager.java b/core/src/main/java/org/geysermc/geyser/SessionManager.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/SessionManager.java
rename to core/src/main/java/org/geysermc/geyser/SessionManager.java
index a2eb6d873..b6ff28a1c 100644
--- a/core/src/main/java/org/geysermc/connector/SessionManager.java
+++ b/core/src/main/java/org/geysermc/geyser/SessionManager.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector;
+package org.geysermc.geyser;
import com.google.common.collect.ImmutableList;
import lombok.AccessLevel;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/core/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java b/core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java
rename to core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java
index 51b64dd7f..65c171453 100644
--- a/core/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java
+++ b/core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java
@@ -23,15 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.bootstrap;
+package org.geysermc.geyser.bootstrap;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.command.CommandManager;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.dump.BootstrapDumpInfo;
-import org.geysermc.connector.network.translators.world.GeyserWorldManager;
-import org.geysermc.connector.network.translators.world.WorldManager;
-import org.geysermc.connector.ping.IGeyserPingPassthrough;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.command.CommandManager;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.dump.BootstrapDumpInfo;
+import org.geysermc.geyser.network.translators.world.GeyserWorldManager;
+import org.geysermc.geyser.network.translators.world.WorldManager;
+import org.geysermc.geyser.ping.IGeyserPingPassthrough;
import javax.annotation.Nullable;
import java.net.SocketAddress;
@@ -108,7 +110,7 @@ public interface GeyserBootstrap {
* that have direct server access - platforms such as proxies always have to be on their latest version to support
* the newest Minecraft version, but older servers can use ViaVersion to enable newer versions to join.
*
- * If used, this should not be null before {@link org.geysermc.connector.GeyserConnector} initialization.
+ * If used, this should not be null before {@link GeyserImpl} initialization.
*
* @return the Minecraft version being used on the server, or null if not applicable
*/
diff --git a/core/src/main/java/org/geysermc/connector/command/CommandExecutor.java b/core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/command/CommandExecutor.java
rename to core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java
index d8b023529..43bf22478 100644
--- a/core/src/main/java/org/geysermc/connector/command/CommandExecutor.java
+++ b/core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command;
+package org.geysermc.geyser.command;
import lombok.AllArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -41,10 +41,10 @@ import java.util.Map;
@AllArgsConstructor
public class CommandExecutor {
- protected final GeyserConnector connector;
+ protected final GeyserImpl geyser;
public GeyserCommand getCommand(String label) {
- return connector.getCommandManager().getCommands().get(label);
+ return geyser.getCommandManager().getCommands().get(label);
}
@Nullable
@@ -53,7 +53,7 @@ public class CommandExecutor {
return null;
}
- for (GeyserSession session : connector.getSessionManager().getSessions().values()) {
+ for (GeyserSession session : geyser.getSessionManager().getSessions().values()) {
if (sender.getName().equals(session.getPlayerEntity().getUsername())) {
return session;
}
@@ -77,7 +77,7 @@ public class CommandExecutor {
}
List availableCommands = new ArrayList<>();
- Map commands = connector.getCommandManager().getCommands();
+ Map commands = geyser.getCommandManager().getCommands();
// Only show commands they have permission to use
for (String name : commands.keySet()) {
diff --git a/core/src/main/java/org/geysermc/connector/command/CommandManager.java b/core/src/main/java/org/geysermc/geyser/command/CommandManager.java
similarity index 61%
rename from core/src/main/java/org/geysermc/connector/command/CommandManager.java
rename to core/src/main/java/org/geysermc/geyser/command/CommandManager.java
index 53cdfb269..7af5f93fd 100644
--- a/core/src/main/java/org/geysermc/connector/command/CommandManager.java
+++ b/core/src/main/java/org/geysermc/geyser/command/CommandManager.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command;
+package org.geysermc.geyser.command;
import lombok.Getter;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.defaults.*;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.defaults.*;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.*;
@@ -40,28 +40,28 @@ public abstract class CommandManager {
@Getter
private final Map commands = Collections.synchronizedMap(new HashMap<>());
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public CommandManager(GeyserConnector connector) {
- this.connector = connector;
+ public CommandManager(GeyserImpl geyser) {
+ this.geyser = geyser;
- registerCommand(new HelpCommand(connector, "help", "geyser.commands.help.desc", "geyser.command.help"));
- registerCommand(new ListCommand(connector, "list", "geyser.commands.list.desc", "geyser.command.list"));
- registerCommand(new ReloadCommand(connector, "reload", "geyser.commands.reload.desc", "geyser.command.reload"));
- registerCommand(new OffhandCommand(connector, "offhand", "geyser.commands.offhand.desc", "geyser.command.offhand"));
- registerCommand(new DumpCommand(connector, "dump", "geyser.commands.dump.desc", "geyser.command.dump"));
- registerCommand(new VersionCommand(connector, "version", "geyser.commands.version.desc", "geyser.command.version"));
- registerCommand(new SettingsCommand(connector, "settings", "geyser.commands.settings.desc", "geyser.command.settings"));
- registerCommand(new StatisticsCommand(connector, "statistics", "geyser.commands.statistics.desc", "geyser.command.statistics"));
+ registerCommand(new HelpCommand(geyser, "help", "geyser.commands.help.desc", "geyser.command.help"));
+ registerCommand(new ListCommand(geyser, "list", "geyser.commands.list.desc", "geyser.command.list"));
+ registerCommand(new ReloadCommand(geyser, "reload", "geyser.commands.reload.desc", "geyser.command.reload"));
+ registerCommand(new OffhandCommand(geyser, "offhand", "geyser.commands.offhand.desc", "geyser.command.offhand"));
+ registerCommand(new DumpCommand(geyser, "dump", "geyser.commands.dump.desc", "geyser.command.dump"));
+ registerCommand(new VersionCommand(geyser, "version", "geyser.commands.version.desc", "geyser.command.version"));
+ registerCommand(new SettingsCommand(geyser, "settings", "geyser.commands.settings.desc", "geyser.command.settings"));
+ registerCommand(new StatisticsCommand(geyser, "statistics", "geyser.commands.statistics.desc", "geyser.command.statistics"));
registerCommand(new AdvancementsCommand("advancements", "geyser.commands.advancements.desc", "geyser.command.advancements"));
- if (GeyserConnector.getInstance().getPlatformType() == PlatformType.STANDALONE) {
- registerCommand(new StopCommand(connector, "stop", "geyser.commands.stop.desc", "geyser.command.stop"));
+ if (GeyserImpl.getInstance().getPlatformType() == PlatformType.STANDALONE) {
+ registerCommand(new StopCommand(geyser, "stop", "geyser.commands.stop.desc", "geyser.command.stop"));
}
}
public void registerCommand(GeyserCommand command) {
commands.put(command.getName(), command);
- connector.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.commands.registered", command.getName()));
+ geyser.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.commands.registered", command.getName()));
if (command.getAliases().isEmpty())
return;
@@ -89,7 +89,7 @@ public abstract class CommandManager {
GeyserCommand cmd = commands.get(label);
if (cmd == null) {
- connector.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.invalid"));
+ geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.invalid"));
return;
}
@@ -99,7 +99,7 @@ public abstract class CommandManager {
if (!cmd.isBedrockOnly()) {
cmd.execute(null, sender, args);
} else {
- connector.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.bedrock_only"));
+ geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.bedrock_only"));
}
}
}
@@ -108,7 +108,7 @@ public abstract class CommandManager {
* @return a list of all subcommands under {@code /geyser}.
*/
public List getCommandNames() {
- return Arrays.asList(connector.getCommandManager().getCommands().keySet().toArray(new String[0]));
+ return Arrays.asList(geyser.getCommandManager().getCommands().keySet().toArray(new String[0]));
}
/**
diff --git a/core/src/main/java/org/geysermc/connector/command/CommandSender.java b/core/src/main/java/org/geysermc/geyser/command/CommandSender.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/command/CommandSender.java
rename to core/src/main/java/org/geysermc/geyser/command/CommandSender.java
index 9fa8673f4..fc9a0be24 100644
--- a/core/src/main/java/org/geysermc/connector/command/CommandSender.java
+++ b/core/src/main/java/org/geysermc/geyser/command/CommandSender.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command;
+package org.geysermc.geyser.command;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.utils.LanguageUtils;
/**
* Implemented on top of any class that can send a command.
diff --git a/core/src/main/java/org/geysermc/connector/command/GeyserCommand.java b/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/command/GeyserCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
index 48fe2eb9a..af462192f 100644
--- a/core/src/main/java/org/geysermc/connector/command/GeyserCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command;
+package org.geysermc.geyser.command;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java
index 8ace83840..11dd28199 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/AdvancementsCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
public class AdvancementsCommand extends GeyserCommand {
public AdvancementsCommand(String name, String description, String permission) {
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java
similarity index 79%
rename from core/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java
index 075bfbbcd..0926b97c3 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java
@@ -23,22 +23,22 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.common.serializer.AsteriskSerializer;
-import org.geysermc.connector.dump.DumpInfo;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
-import org.geysermc.connector.utils.WebUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.common.serializer.AsteriskSerializer;
+import org.geysermc.geyser.dump.DumpInfo;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
+import org.geysermc.geyser.utils.WebUtils;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -47,20 +47,20 @@ import java.util.List;
public class DumpCommand extends GeyserCommand {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
private static final ObjectMapper MAPPER = new ObjectMapper();
private static final String DUMP_URL = "https://dump.geysermc.org/";
- public DumpCommand(GeyserConnector connector, String name, String description, String permission) {
+ public DumpCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
- this.connector = connector;
+ this.geyser = geyser;
}
@Override
public void execute(GeyserSession session, CommandSender sender, String[] args) {
// Only allow the console to create dumps on Geyser Standalone
- if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
+ if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
return;
}
@@ -93,7 +93,7 @@ public class DumpCommand extends GeyserCommand {
}
} catch (IOException e) {
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.collect_error", sender.getLocale()));
- connector.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e);
+ geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e);
return;
}
@@ -103,12 +103,12 @@ public class DumpCommand extends GeyserCommand {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.writing", sender.getLocale()));
try {
- FileOutputStream outputStream = new FileOutputStream(GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("dump.json").toFile());
+ FileOutputStream outputStream = new FileOutputStream(GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("dump.json").toFile());
outputStream.write(dumpData.getBytes());
outputStream.close();
} catch (IOException e) {
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.write_error", sender.getLocale()));
- connector.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.write_error_short"), e);
+ geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.write_error_short"), e);
return;
}
@@ -123,7 +123,7 @@ public class DumpCommand extends GeyserCommand {
responseNode = MAPPER.readTree(response);
} catch (IOException e) {
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.upload_error", sender.getLocale()));
- connector.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
+ geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
return;
}
@@ -137,7 +137,7 @@ public class DumpCommand extends GeyserCommand {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.message", sender.getLocale()) + " " + ChatColor.DARK_AQUA + uploadedDumpUrl);
if (!sender.isConsole()) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.commands.dump.created", sender.getName(), uploadedDumpUrl));
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.commands.dump.created", sender.getName(), uploadedDumpUrl));
}
}
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java
similarity index 80%
rename from core/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java
index c180a473d..00e18cf0a 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java
@@ -23,24 +23,24 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.Collections;
import java.util.Map;
public class HelpCommand extends GeyserCommand {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public HelpCommand(GeyserConnector connector, String name, String description, String permission) {
+ public HelpCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
- this.connector = connector;
+ this.geyser = geyser;
this.setAliases(Collections.singletonList("?"));
}
@@ -59,7 +59,7 @@ public class HelpCommand extends GeyserCommand {
String header = LanguageUtils.getPlayerLocaleString("geyser.commands.help.header", sender.getLocale(), page, maxPage);
sender.sendMessage(header);
- Map cmds = connector.getCommandManager().getCommands();
+ Map cmds = geyser.getCommandManager().getCommands();
for (String cmdName : cmds.keySet()) {
GeyserCommand cmd = cmds.get(cmdName);
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java
similarity index 70%
rename from core/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java
index 3058f2982..4f4b610d1 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java
@@ -23,31 +23,31 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.stream.Collectors;
public class ListCommand extends GeyserCommand {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public ListCommand(GeyserConnector connector, String name, String description, String permission) {
+ public ListCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
- this.connector = connector;
+ this.geyser = geyser;
}
@Override
public void execute(GeyserSession session, CommandSender sender, String[] args) {
String message = LanguageUtils.getPlayerLocaleString("geyser.commands.list.message", sender.getLocale(),
- connector.getSessionManager().size(),
- connector.getSessionManager().getAllSessions().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
+ geyser.getSessionManager().size(),
+ geyser.getSessionManager().getAllSessions().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
sender.sendMessage(message);
}
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java
similarity index 83%
rename from core/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java
index 06d554ece..c9a5b818e 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java
@@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.BlockUtils;
public class OffhandCommand extends GeyserCommand {
- public OffhandCommand(GeyserConnector connector, String name, String description, String permission) {
+ public OffhandCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
}
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java
similarity index 70%
rename from core/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java
index 3fa5adc31..d8ceda637 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java
@@ -23,27 +23,27 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
public class ReloadCommand extends GeyserCommand {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public ReloadCommand(GeyserConnector connector, String name, String description, String permission) {
+ public ReloadCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
- this.connector = connector;
+ this.geyser = geyser;
}
@Override
public void execute(GeyserSession session, CommandSender sender, String[] args) {
- if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
+ if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) {
return;
}
@@ -51,7 +51,7 @@ public class ReloadCommand extends GeyserCommand {
sender.sendMessage(message);
- connector.getSessionManager().disconnectAll("geyser.commands.reload.kick");
- connector.reload();
+ geyser.getSessionManager().disconnectAll("geyser.commands.reload.kick");
+ geyser.reload();
}
}
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java
similarity index 80%
rename from core/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java
index 0f85e3c8f..ec561b6ff 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.SettingsUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.SettingsUtils;
public class SettingsCommand extends GeyserCommand {
- public SettingsCommand(GeyserConnector connector, String name, String description, String permission) {
+ public SettingsCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
}
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java
index f458e3003..c925c73b0 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/StatisticsCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
import com.github.steveice10.mc.protocol.data.game.ClientCommand;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
public class StatisticsCommand extends GeyserCommand {
- public StatisticsCommand(GeyserConnector connector, String name, String description, String permission) {
+ public StatisticsCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
}
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java
similarity index 72%
rename from core/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java
index ad5049432..23d9a88d7 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java
@@ -23,35 +23,35 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.Collections;
public class StopCommand extends GeyserCommand {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public StopCommand(GeyserConnector connector, String name, String description, String permission) {
+ public StopCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
- this.connector = connector;
+ this.geyser = geyser;
this.setAliases(Collections.singletonList("shutdown"));
}
@Override
public void execute(GeyserSession session, CommandSender sender, String[] args) {
- if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
+ if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
return;
}
- connector.getBootstrap().onDisable();
+ geyser.getBootstrap().onDisable();
}
}
\ No newline at end of file
diff --git a/core/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java b/core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
similarity index 78%
rename from core/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java
rename to core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
index ab979ccff..e3530071d 100644
--- a/core/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
@@ -23,19 +23,19 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.command.defaults;
+package org.geysermc.geyser.command.defaults;
import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandSender;
-import org.geysermc.connector.command.GeyserCommand;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.connector.utils.LanguageUtils;
-import org.geysermc.connector.utils.WebUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.FileUtils;
+import org.geysermc.geyser.utils.LanguageUtils;
+import org.geysermc.geyser.utils.WebUtils;
import java.io.IOException;
import java.net.URLEncoder;
@@ -45,12 +45,12 @@ import java.util.Properties;
public class VersionCommand extends GeyserCommand {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public VersionCommand(GeyserConnector connector, String name, String description, String permission) {
+ public VersionCommand(GeyserImpl geyser, String name, String description, String permission) {
super(name, description, permission);
- this.connector = connector;
+ this.geyser = geyser;
}
@Override
@@ -64,10 +64,10 @@ public class VersionCommand extends GeyserCommand {
}
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.version", sender.getLocale(),
- GeyserConnector.NAME, GeyserConnector.VERSION, MinecraftProtocol.getJavaVersion(), bedrockVersions));
+ GeyserImpl.NAME, GeyserImpl.VERSION, MinecraftProtocol.getJavaVersion(), bedrockVersions));
// Disable update checking in dev mode and for players in Geyser Standalone
- if (GeyserConnector.getInstance().isProductionEnvironment() && !(!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE)) {
+ if (GeyserImpl.getInstance().isProductionEnvironment() && !(!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.checking", sender.getLocale()));
try {
Properties gitProp = new Properties();
@@ -88,7 +88,7 @@ public class VersionCommand extends GeyserCommand {
throw new AssertionError("buildNumber missing");
}
} catch (IOException | AssertionError | NumberFormatException e) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.version.failed"), e);
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.version.failed"), e);
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.version.failed", sender.getLocale()));
}
}
diff --git a/core/src/main/java/org/geysermc/connector/common/AuthType.java b/core/src/main/java/org/geysermc/geyser/common/AuthType.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/common/AuthType.java
rename to core/src/main/java/org/geysermc/geyser/common/AuthType.java
index 41810a1ce..ea5812663 100644
--- a/core/src/main/java/org/geysermc/connector/common/AuthType.java
+++ b/core/src/main/java/org/geysermc/geyser/common/AuthType.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common;
+package org.geysermc.geyser.common;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/core/src/main/java/org/geysermc/connector/common/ChatColor.java b/core/src/main/java/org/geysermc/geyser/common/ChatColor.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/common/ChatColor.java
rename to core/src/main/java/org/geysermc/geyser/common/ChatColor.java
index 946be39c4..6c57cd5c1 100644
--- a/core/src/main/java/org/geysermc/connector/common/ChatColor.java
+++ b/core/src/main/java/org/geysermc/geyser/common/ChatColor.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common;
+package org.geysermc.geyser.common;
public class ChatColor {
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java b/core/src/main/java/org/geysermc/geyser/common/connection/ChannelWrapper.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/ChannelWrapper.java
index 71ab16651..985e690b1 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/ChannelWrapper.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/ChannelWrapper.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.*;
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java b/core/src/main/java/org/geysermc/geyser/common/connection/DefaultChannelPipelinePublic.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/DefaultChannelPipelinePublic.java
index 4749eeb4c..a55d583d1 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/DefaultChannelPipelinePublic.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/DefaultChannelPipelinePublic.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import io.netty.channel.Channel;
import io.netty.channel.DefaultChannelPipeline;
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java b/core/src/main/java/org/geysermc/geyser/common/connection/GeyserInjector.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/GeyserInjector.java
index 443e805eb..5e9f4f28f 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/GeyserInjector.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/GeyserInjector.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import io.netty.channel.ChannelFuture;
import lombok.Getter;
-import org.geysermc.connector.bootstrap.GeyserBootstrap;
+import org.geysermc.geyser.bootstrap.GeyserBootstrap;
import java.net.SocketAddress;
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java b/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWithRemoteAddress.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWithRemoteAddress.java
index 6cd01d591..d6528f11b 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWithRemoteAddress.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWithRemoteAddress.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import io.netty.channel.local.LocalChannel;
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java b/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWrapper.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWrapper.java
index ad9b3e8f7..edd3d4414 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/LocalChannelWrapper.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/LocalChannelWrapper.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import io.netty.channel.DefaultChannelPipeline;
import io.netty.channel.local.LocalChannel;
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java b/core/src/main/java/org/geysermc/geyser/common/connection/LocalServerChannelWrapper.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/LocalServerChannelWrapper.java
index 3c37709ec..5a06c9727 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/LocalServerChannelWrapper.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/LocalServerChannelWrapper.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import io.netty.channel.local.LocalChannel;
import io.netty.channel.local.LocalServerChannel;
diff --git a/core/src/main/java/org/geysermc/connector/common/connection/LocalSession.java b/core/src/main/java/org/geysermc/geyser/common/connection/LocalSession.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/common/connection/LocalSession.java
rename to core/src/main/java/org/geysermc/geyser/common/connection/LocalSession.java
index 7bd08a732..d29675835 100644
--- a/core/src/main/java/org/geysermc/connector/common/connection/LocalSession.java
+++ b/core/src/main/java/org/geysermc/geyser/common/connection/LocalSession.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.connection;
+package org.geysermc.geyser.common.connection;
import com.github.steveice10.packetlib.BuiltinFlags;
import com.github.steveice10.packetlib.packet.PacketProtocol;
diff --git a/core/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java b/core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java
rename to core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java
index 8490dc7f2..bb70012cc 100644
--- a/core/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java
+++ b/core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.main;
+package org.geysermc.geyser.common.main;
import javax.swing.*;
import java.io.InputStream;
diff --git a/core/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java b/core/src/main/java/org/geysermc/geyser/common/ping/GeyserPingInfo.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java
rename to core/src/main/java/org/geysermc/geyser/common/ping/GeyserPingInfo.java
index 4f86ddfb2..6a7f1f13c 100644
--- a/core/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java
+++ b/core/src/main/java/org/geysermc/geyser/common/ping/GeyserPingInfo.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.ping;
+package org.geysermc.geyser.common.ping;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/core/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java b/core/src/main/java/org/geysermc/geyser/common/serializer/AsteriskSerializer.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java
rename to core/src/main/java/org/geysermc/geyser/common/serializer/AsteriskSerializer.java
index 8ea6ef220..929ac8d9a 100644
--- a/core/src/main/java/org/geysermc/connector/common/serializer/AsteriskSerializer.java
+++ b/core/src/main/java/org/geysermc/geyser/common/serializer/AsteriskSerializer.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.common.serializer;
+package org.geysermc.geyser.common.serializer;
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/core/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java b/core/src/main/java/org/geysermc/geyser/configuration/EmoteOffhandWorkaroundOption.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java
rename to core/src/main/java/org/geysermc/geyser/configuration/EmoteOffhandWorkaroundOption.java
index c28048046..87421ad92 100644
--- a/core/src/main/java/org/geysermc/connector/configuration/EmoteOffhandWorkaroundOption.java
+++ b/core/src/main/java/org/geysermc/geyser/configuration/EmoteOffhandWorkaroundOption.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.configuration;
+package org.geysermc.geyser.configuration;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/core/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java
rename to core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java
index 2e05b0c18..b9e735c94 100644
--- a/core/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java
+++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java
@@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.configuration;
+package org.geysermc.geyser.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.network.CIDRMatcher;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption;
+import org.geysermc.geyser.network.CIDRMatcher;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.nio.file.Path;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java
rename to core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
index c6967adf1..9c5fc229f 100644
--- a/core/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java
+++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.configuration;
+package org.geysermc.geyser.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -34,11 +34,11 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.common.serializer.AsteriskSerializer;
-import org.geysermc.connector.network.CIDRMatcher;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.common.serializer.AsteriskSerializer;
+import org.geysermc.geyser.network.CIDRMatcher;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.io.IOException;
import java.nio.file.Path;
@@ -151,7 +151,7 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
private String motd2 = "Geyser";
@JsonProperty("server-name")
- private String serverName = GeyserConnector.NAME;
+ private String serverName = GeyserImpl.NAME;
@JsonProperty("compression-level")
private int compressionLevel = 6;
diff --git a/core/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java b/core/src/main/java/org/geysermc/geyser/dump/BootstrapDumpInfo.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java
rename to core/src/main/java/org/geysermc/geyser/dump/BootstrapDumpInfo.java
index afcbda6a4..6b421f912 100644
--- a/core/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java
+++ b/core/src/main/java/org/geysermc/geyser/dump/BootstrapDumpInfo.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.dump;
+package org.geysermc.geyser.dump;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.geyser.GeyserImpl;
import java.util.List;
@@ -37,7 +37,7 @@ public class BootstrapDumpInfo {
private final PlatformType platform;
public BootstrapDumpInfo() {
- this.platform = GeyserConnector.getInstance().getPlatformType();
+ this.platform = GeyserImpl.getInstance().getPlatformType();
}
@Getter
diff --git a/core/src/main/java/org/geysermc/connector/dump/DumpInfo.java b/core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/dump/DumpInfo.java
rename to core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
index c65bbbc51..a6cc971ea 100644
--- a/core/src/main/java/org/geysermc/connector/dump/DumpInfo.java
+++ b/core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.dump;
+package org.geysermc.geyser.dump;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.JsonNode;
@@ -35,14 +35,14 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import lombok.AllArgsConstructor;
import lombok.Getter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.serializer.AsteriskSerializer;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.DockerCheck;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.connector.utils.WebUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.common.serializer.AsteriskSerializer;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.DockerCheck;
+import org.geysermc.geyser.utils.FileUtils;
+import org.geysermc.geyser.utils.WebUtils;
import org.geysermc.floodgate.util.DeviceOs;
import org.geysermc.floodgate.util.FloodgateInfoHolder;
@@ -84,7 +84,7 @@ public class DumpInfo {
} catch (IOException ignored) {
}
- this.config = GeyserConnector.getInstance().getConfig();
+ this.config = GeyserImpl.getInstance().getConfig();
this.floodgate = new Floodgate();
String md5Hash = "unknown";
@@ -100,7 +100,7 @@ public class DumpInfo {
//noinspection UnstableApiUsage
sha256Hash = byteSource.hash(Hashing.sha256()).toString();
} catch (Exception e) {
- if (GeyserConnector.getInstance().getConfig().isDebugMode()) {
+ if (GeyserImpl.getInstance().getConfig().isDebugMode()) {
e.printStackTrace();
}
}
@@ -113,12 +113,12 @@ public class DumpInfo {
}
this.userPlatforms = new Object2IntOpenHashMap<>();
- for (GeyserSession session : GeyserConnector.getInstance().getSessionManager().getAllSessions()) {
+ for (GeyserSession session : GeyserImpl.getInstance().getSessionManager().getAllSessions()) {
DeviceOs device = session.getClientData().getDeviceOs();
userPlatforms.put(device, userPlatforms.getOrDefault(device, 0) + 1);
}
- this.bootstrapInfo = GeyserConnector.getInstance().getBootstrap().getDumpInfo();
+ this.bootstrapInfo = GeyserImpl.getInstance().getBootstrap().getDumpInfo();
this.flagsInfo = new FlagsInfo();
}
@@ -138,8 +138,8 @@ public class DumpInfo {
private final MCInfo mcInfo;
VersionInfo() {
- this.name = GeyserConnector.NAME;
- this.version = GeyserConnector.VERSION;
+ this.name = GeyserImpl.NAME;
+ this.version = GeyserImpl.VERSION;
this.javaName = System.getProperty("java.vm.name");
this.javaVendor = System.getProperty("java.vendor");
this.javaVersion = ManagementFactory.getRuntimeMXBean().getVmVersion(); // Gives a little more to the version we can use over the system property
@@ -216,9 +216,9 @@ public class DumpInfo {
public LogsInfo() {
try {
Map fields = new HashMap<>();
- fields.put("content", FileUtils.readAllLines(GeyserConnector.getInstance().getBootstrap().getLogsPath()).collect(Collectors.joining("\n")));
+ fields.put("content", FileUtils.readAllLines(GeyserImpl.getInstance().getBootstrap().getLogsPath()).collect(Collectors.joining("\n")));
- JsonNode logData = GeyserConnector.JSON_MAPPER.readTree(WebUtils.postForm("https://api.mclo.gs/1/log", fields));
+ JsonNode logData = GeyserImpl.JSON_MAPPER.readTree(WebUtils.postForm("https://api.mclo.gs/1/log", fields));
this.link = logData.get("url").textValue();
} catch (IOException ignored) { }
diff --git a/core/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java b/core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java
index 27ca23a2e..912d4b8a1 100644
--- a/core/src/main/java/org/geysermc/connector/entity/AbstractArrowEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java b/core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java
index 3e91ba0e5..b200d8f48 100644
--- a/core/src/main/java/org/geysermc/connector/entity/AreaEffectCloudEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
@@ -31,8 +31,8 @@ import com.github.steveice10.mc.protocol.data.game.level.particle.Particle;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.EffectUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.EffectUtils;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/BoatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/entity/BoatEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java
index 8283511cb..24d3b5bb2 100644
--- a/core/src/main/java/org/geysermc/connector/entity/BoatEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -32,7 +32,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.packet.AnimatePacket;
import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java
index fcd4e05a3..e65952c02 100644
--- a/core/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java
index bcc88c33f..50851eac6 100644
--- a/core/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java b/core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java
index 1a8a9bd5f..203f42033 100644
--- a/core/src/main/java/org/geysermc/connector/entity/EnderCrystalEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
@@ -31,7 +31,7 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Optional;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/Entity.java b/core/src/main/java/org/geysermc/geyser/entity/Entity.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/Entity.java
rename to core/src/main/java/org/geysermc/geyser/entity/Entity.java
index db7f92dca..703ca212f 100644
--- a/core/src/main/java/org/geysermc/connector/entity/Entity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/Entity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose;
@@ -43,9 +43,9 @@ import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.kyori.adventure.text.Component;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.utils.MathUtils;
import java.util.Optional;
import java.util.UUID;
@@ -157,7 +157,7 @@ public class Entity {
flagsDirty = false;
- session.getConnector().getLogger().debug("Spawned entity " + getClass().getName() + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
+ session.getGeyser().getLogger().debug("Spawned entity " + getClass().getName() + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
}
/**
diff --git a/core/src/main/java/org/geysermc/connector/entity/EntityDefinition.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/EntityDefinition.java
rename to core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java
index d0c7c3826..31190d892 100644
--- a/core/src/main/java/org/geysermc/connector/entity/EntityDefinition.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
@@ -31,10 +31,10 @@ import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import lombok.Setter;
import lombok.experimental.Accessors;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.entity.factory.BaseEntityFactory;
-import org.geysermc.connector.entity.factory.EntityFactory;
-import org.geysermc.connector.registry.Registries;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.entity.factory.BaseEntityFactory;
+import org.geysermc.geyser.entity.factory.EntityFactory;
+import org.geysermc.geyser.registry.Registries;
import java.util.List;
import java.util.Locale;
@@ -71,9 +71,9 @@ public record EntityDefinition(EntityFactory factory, Entit
}
if (translator.acceptedType() != metadata.getType()) {
- GeyserConnector.getInstance().getLogger().warning("Metadata ID " + metadata.getId() + " was received with type " + metadata.getType() + " but we expected " + translator.acceptedType() + " for " + entity.getDefinition().entityType());
- if (GeyserConnector.getInstance().getConfig().isDebugMode()) {
- GeyserConnector.getInstance().getLogger().debug(metadata.toString());
+ GeyserImpl.getInstance().getLogger().warning("Metadata ID " + metadata.getId() + " was received with type " + metadata.getType() + " but we expected " + translator.acceptedType() + " for " + entity.getDefinition().entityType());
+ if (GeyserImpl.getInstance().getConfig().isDebugMode()) {
+ GeyserImpl.getInstance().getLogger().debug(metadata.toString());
}
return;
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java
rename to core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
index 4700b81c5..fb21e68ff 100644
--- a/core/src/main/java/org/geysermc/connector/entity/EntityDefinitions.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
@@ -31,26 +31,26 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEnt
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.factory.BaseEntityFactory;
-import org.geysermc.connector.entity.factory.ExperienceOrbEntityFactory;
-import org.geysermc.connector.entity.factory.PaintingEntityFactory;
-import org.geysermc.connector.entity.living.*;
-import org.geysermc.connector.entity.living.animal.*;
-import org.geysermc.connector.entity.living.animal.horse.*;
-import org.geysermc.connector.entity.living.animal.tameable.CatEntity;
-import org.geysermc.connector.entity.living.animal.tameable.ParrotEntity;
-import org.geysermc.connector.entity.living.animal.tameable.TameableEntity;
-import org.geysermc.connector.entity.living.animal.tameable.WolfEntity;
-import org.geysermc.connector.entity.living.merchant.AbstractMerchantEntity;
-import org.geysermc.connector.entity.living.merchant.VillagerEntity;
-import org.geysermc.connector.entity.living.monster.*;
-import org.geysermc.connector.entity.living.monster.raid.PillagerEntity;
-import org.geysermc.connector.entity.living.monster.raid.RaidParticipantEntity;
-import org.geysermc.connector.entity.living.monster.raid.SpellcasterIllagerEntity;
-import org.geysermc.connector.entity.living.monster.raid.VindicatorEntity;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.registry.Registries;
+import org.geysermc.geyser.entity.factory.BaseEntityFactory;
+import org.geysermc.geyser.entity.factory.ExperienceOrbEntityFactory;
+import org.geysermc.geyser.entity.factory.PaintingEntityFactory;
+import org.geysermc.geyser.entity.living.*;
+import org.geysermc.geyser.entity.living.animal.*;
+import org.geysermc.geyser.entity.living.animal.horse.*;
+import org.geysermc.geyser.entity.living.animal.tameable.CatEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.ParrotEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.TameableEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.WolfEntity;
+import org.geysermc.geyser.entity.living.merchant.AbstractMerchantEntity;
+import org.geysermc.geyser.entity.living.merchant.VillagerEntity;
+import org.geysermc.geyser.entity.living.monster.*;
+import org.geysermc.geyser.entity.living.monster.raid.PillagerEntity;
+import org.geysermc.geyser.entity.living.monster.raid.RaidParticipantEntity;
+import org.geysermc.geyser.entity.living.monster.raid.SpellcasterIllagerEntity;
+import org.geysermc.geyser.entity.living.monster.raid.VindicatorEntity;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.registry.Registries;
public final class EntityDefinitions {
public static final EntityDefinition AREA_EFFECT_CLOUD;
diff --git a/core/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java b/core/src/main/java/org/geysermc/geyser/entity/EntityMetadataTranslator.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java
rename to core/src/main/java/org/geysermc/geyser/entity/EntityMetadataTranslator.java
index 8023ce47c..fa6758210 100644
--- a/core/src/main/java/org/geysermc/connector/entity/EntityMetadataTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/EntityMetadataTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
diff --git a/core/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java
index 14dacc4cd..830d5e368 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ExpOrbEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public class ExpOrbEntity extends Entity {
diff --git a/core/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java b/core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java
index 6339a080d..25d19c876 100644
--- a/core/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/FireworkEntity.java b/core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java
index deac6b0dd..f1bcb9a40 100644
--- a/core/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@@ -36,10 +36,10 @@ import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.nbt.NbtType;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.packet.SetEntityMotionPacket;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.FireworkColor;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.FireworkColor;
+import org.geysermc.geyser.utils.MathUtils;
import org.geysermc.floodgate.util.DeviceOs;
import java.util.ArrayList;
diff --git a/core/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java b/core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java
index 84d7e686a..b5dde3c6e 100644
--- a/core/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
@@ -31,14 +31,14 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket;
import lombok.Getter;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.translators.BlockCollision;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.utils.BlockPositionIterator;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.translators.BlockCollision;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.utils.BlockPositionIterator;
+import org.geysermc.geyser.utils.BlockUtils;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
@@ -102,7 +102,7 @@ public class FishingHookEntity extends ThrowableEntity {
boolean touchingWater = false;
boolean collided = false;
for (BlockPositionIterator iter = session.getCollisionManager().collidableBlocksIterator(boundingBox); iter.hasNext(); iter.next()) {
- int blockID = session.getConnector().getWorldManager().getBlockAt(session, iter.getX(), iter.getY(), iter.getZ());
+ int blockID = session.getGeyser().getWorldManager().getBlockAt(session, iter.getX(), iter.getY(), iter.getZ());
BlockCollision blockCollision = BlockUtils.getCollision(blockID);
if (blockCollision != null) {
if (blockCollision.checkIntersection(iter.getX(), iter.getY(), iter.getZ(), boundingBox)) {
@@ -181,7 +181,7 @@ public class FishingHookEntity extends ThrowableEntity {
* @return true if this entity is currently in air.
*/
protected boolean isInAir() {
- int block = session.getConnector().getWorldManager().getBlockAt(session, position.toInt());
+ int block = session.getGeyser().getWorldManager().getBlockAt(session, position.toInt());
return block == BlockStateValues.JAVA_AIR_ID;
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java
index 13116e9d7..f4eac3457 100644
--- a/core/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java b/core/src/main/java/org/geysermc/geyser/entity/GeyserDirtyMetadata.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java
rename to core/src/main/java/org/geysermc/geyser/entity/GeyserDirtyMetadata.java
index 09cd79562..f50548f15 100644
--- a/core/src/main/java/org/geysermc/connector/entity/GeyserDirtyMetadata.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/GeyserDirtyMetadata.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityDataMap;
diff --git a/core/src/main/java/org/geysermc/connector/entity/ItemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/ItemEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java
index f27aa8227..bacbce098 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ItemEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@@ -34,9 +34,9 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.AddItemEntityPacket;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import java.util.UUID;
@@ -117,7 +117,7 @@ public class ItemEntity extends ThrowableEntity {
super.moveAbsoluteImmediate(position.add(0, offset, 0), 0, 0, 0, isOnGround, teleported);
this.position = position;
- int block = session.getConnector().getWorldManager().getBlockAt(session, position.toInt());
+ int block = session.getGeyser().getWorldManager().getBlockAt(session, position.toInt());
waterLevel = BlockStateValues.getWaterLevel(block);
}
@@ -135,7 +135,7 @@ public class ItemEntity extends ThrowableEntity {
protected float getDrag() {
if (onGround) {
Vector3i groundBlockPos = position.toInt().down(1);
- int blockState = session.getConnector().getWorldManager().getBlockAt(session, groundBlockPos);
+ int blockState = session.getGeyser().getWorldManager().getBlockAt(session, groundBlockPos);
return BlockStateValues.getSlipperiness(blockState) * 0.98f;
}
return 0.98f;
diff --git a/core/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java
index c4210f074..e4026570e 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@@ -39,9 +39,9 @@ import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
@@ -105,7 +105,7 @@ public class ItemFrameEntity extends Entity {
@Override
public void spawnEntity() {
updateBlock(true);
- session.getConnector().getLogger().debug("Spawned item frame at location " + bedrockPosition + " with java id " + entityId);
+ session.getGeyser().getLogger().debug("Spawned item frame at location " + bedrockPosition + " with java id " + entityId);
valid = true;
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java
index 16f361683..8775c3282 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ItemedFireballEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java b/core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java
index c5697346e..1634552b8 100644
--- a/core/src/main/java/org/geysermc/connector/entity/LeashKnotEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/LightningEntity.java b/core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/LightningEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java
index d9c5655b3..6de3c3eb3 100644
--- a/core/src/main/java/org/geysermc/connector/entity/LightningEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/core/src/main/java/org/geysermc/connector/entity/LivingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/LivingEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java
index 40e65690e..16d5c316c 100644
--- a/core/src/main/java/org/geysermc/connector/entity/LivingEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
@@ -45,11 +45,11 @@ import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.entity.attribute.GeyserAttributeType;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.AttributeUtils;
-import org.geysermc.connector.utils.ChunkUtils;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.AttributeUtils;
+import org.geysermc.geyser.utils.ChunkUtils;
import java.util.ArrayList;
import java.util.Collections;
@@ -120,7 +120,7 @@ public class LivingEntity extends Entity {
Position bedPosition = optionalPos.get();
Vector3i vector = Vector3i.from(bedPosition.getX(), bedPosition.getY(), bedPosition.getZ());
dirtyMetadata.put(EntityData.BED_POSITION, vector);
- int bed = session.getConnector().getWorldManager().getBlockAt(session, bedPosition);
+ int bed = session.getGeyser().getWorldManager().getBlockAt(session, bedPosition);
// Bed has to be updated, or else player is floating in the air
ChunkUtils.updateBlock(session, bed, bedPosition);
// Indicate that the player should enter the sleep cycle
diff --git a/core/src/main/java/org/geysermc/connector/entity/MinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java
index cbc30561c..66f2f3d67 100644
--- a/core/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/PaintingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/PaintingEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java
index e164883c5..d5886f445 100644
--- a/core/src/main/java/org/geysermc/connector/entity/PaintingEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.AddPaintingPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.PaintingType;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.PaintingType;
import java.util.UUID;
@@ -55,7 +55,7 @@ public class PaintingEntity extends Entity {
valid = true;
- session.getConnector().getLogger().debug("Spawned painting on " + position);
+ session.getGeyser().getLogger().debug("Spawned painting on " + position);
}
@Override
diff --git a/core/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java
index 0cf159f0e..4ee6c8bbc 100644
--- a/core/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/TNTEntity.java b/core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/TNTEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java
index d71b1f1e7..e4e67ff83 100644
--- a/core/src/main/java/org/geysermc/connector/entity/TNTEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -31,7 +31,7 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java
index 5c181fe0f..f68f4c760 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ThrowableEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.nukkitx.math.vector.Vector3f;
@@ -31,8 +31,8 @@ import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
import com.nukkitx.protocol.bedrock.packet.MoveEntityDeltaPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import java.util.UUID;
@@ -165,7 +165,7 @@ public class ThrowableEntity extends Entity implements Tickable {
* @return true if this entity is currently in water.
*/
protected boolean isInWater() {
- int block = session.getConnector().getWorldManager().getBlockAt(session, position.toInt());
+ int block = session.getGeyser().getWorldManager().getBlockAt(session, position.toInt());
return BlockStateValues.getWaterLevel(block) != -1;
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java
index d1800f716..e54d337b6 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ThrowableItemEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java b/core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java
index 7c108dda9..497e85914 100644
--- a/core/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@@ -32,10 +32,10 @@ import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.item.Potion;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.item.Potion;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.EnumSet;
import java.util.UUID;
@@ -59,7 +59,7 @@ public class ThrownPotionEntity extends ThrowableItemEntity {
setFlag(EntityFlag.ENCHANTED, !NON_ENCHANTED_POTIONS.contains(potion));
} else {
dirtyMetadata.put(EntityData.POTION_AUX_VALUE, 0);
- GeyserConnector.getInstance().getLogger().debug("Unknown java potion: " + potionTag.getValue());
+ GeyserImpl.getInstance().getLogger().debug("Unknown java potion: " + potionTag.getValue());
}
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/Tickable.java b/core/src/main/java/org/geysermc/geyser/entity/Tickable.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/Tickable.java
rename to core/src/main/java/org/geysermc/geyser/entity/Tickable.java
index f5f0188fc..1634ea87d 100644
--- a/core/src/main/java/org/geysermc/connector/entity/Tickable.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/Tickable.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
/**
* Implemented onto anything that should have code ran every Minecraft tick - 50 milliseconds.
diff --git a/core/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java b/core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java
index df0f12854..330de942b 100644
--- a/core/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.item.TippedArrowPotion;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.item.TippedArrowPotion;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/TridentEntity.java b/core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/TridentEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java
index 5c53ce357..e6dc2f252 100644
--- a/core/src/main/java/org/geysermc/connector/entity/TridentEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java b/core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java
index 643757329..c314159b7 100644
--- a/core/src/main/java/org/geysermc/connector/entity/WitherSkullEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity;
+package org.geysermc.geyser.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java b/core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java
rename to core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java
index 54719d89e..86f2a1923 100644
--- a/core/src/main/java/org/geysermc/connector/entity/attribute/GeyserAttributeType.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.attribute;
+package org.geysermc.geyser.entity.attribute;
import com.nukkitx.protocol.bedrock.data.AttributeData;
import lombok.AllArgsConstructor;
diff --git a/core/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java
rename to core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java
index 67b0e5609..651064c42 100644
--- a/core/src/main/java/org/geysermc/connector/entity/factory/BaseEntityFactory.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.factory;
+package org.geysermc.geyser.entity.factory;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java
rename to core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java
index 542b9a018..38d27607e 100644
--- a/core/src/main/java/org/geysermc/connector/entity/factory/EntityFactory.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.factory;
+package org.geysermc.geyser.entity.factory;
-import org.geysermc.connector.entity.Entity;
+import org.geysermc.geyser.entity.Entity;
public interface EntityFactory {
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java
rename to core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java
index 41d8db1c8..74a4c530b 100644
--- a/core/src/main/java/org/geysermc/connector/entity/factory/ExperienceOrbEntityFactory.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.factory;
+package org.geysermc.geyser.entity.factory;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.ExpOrbEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.ExpOrbEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
@FunctionalInterface
public interface ExperienceOrbEntityFactory extends EntityFactory {
diff --git a/core/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java b/core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java
rename to core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java
index 95bac4c44..425defe61 100644
--- a/core/src/main/java/org/geysermc/connector/entity/factory/PaintingEntityFactory.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.factory;
+package org.geysermc.geyser.entity.factory;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.PaintingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.PaintingType;
+import org.geysermc.geyser.entity.PaintingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.PaintingType;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java
index 43bbf4544..c92ccbb9f 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java
index 1bb4caef0..9ce8a080c 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java
index 38e3483a6..89f2e7e16 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/AmbientEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java
index 685232381..99e570aa8 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Rotation;
@@ -35,10 +35,10 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket;
import lombok.Getter;
import net.kyori.adventure.text.Component;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.LivingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.LivingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Optional;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/BatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/BatEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java
index ed6f39f39..1fe7e758e 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/BatEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java
index e0407e0fc..e42795371 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/CreatureEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java
index 1cf362985..508ab98bc 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/FlyingEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java
index f99c9ee4d..ca6a1c7b2 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/GlowSquidEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java
index da88f5acc..5b0a99efc 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/GolemEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java
index 21e495239..69bfafa9a 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/IronGolemEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java
index bdbac85a7..c926eff70 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/MobEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/MobEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java
index 605f901f5..bf7aae272 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/MobEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import lombok.Getter;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.LivingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.LivingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java
index 7ab1fad0e..17c1471d4 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/SlimeEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java
index afd6daf5d..6bc74de65 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/SnowGolemEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java
index 18c1ec9a8..0802b30ed 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/SquidEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.MoveEntityDeltaPacket;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.Tickable;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.Tickable;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import java.util.UUID;
@@ -124,7 +124,7 @@ public class SquidEntity extends WaterEntity implements Tickable {
if (getFlag(EntityFlag.RIDING)) {
inWater = false;
} else {
- int block = session.getConnector().getWorldManager().getBlockAt(session, position.toInt());
+ int block = session.getGeyser().getWorldManager().getBlockAt(session, position.toInt());
inWater = BlockStateValues.getWaterLevel(block) != -1;
}
}
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java
index 4766841ac..1ace4fe22 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/WaterEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living;
+package org.geysermc.geyser.entity.living;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java
index 60d2ba96a..b61dbf0d4 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/AnimalEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.AgeableEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.AgeableEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java
index 38f5a10a8..568d7a03a 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/AxolotlEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java
index 7e6e8f1a8..406213a7c 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/BeeEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -32,9 +32,9 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java
index a32262199..a28be7611 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/ChickenEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java
index 84b2f1071..e550a955d 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/FoxEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java
index 5b5843480..11a46315a 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/GoatEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import lombok.Getter;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java
index 81f340578..06c408486 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/HoglinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.DimensionUtils;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java
index 2047b8afe..cbad36252 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/MooshroomEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java
index 945787417..f473f1d15 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/OcelotEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java
index 6ddc66ab9..c41ffb3cf 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/PandaEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -32,9 +32,9 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java
index b31470e1b..03553b08c 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/PigEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java
index c83e6bad4..9ff1b1918 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/PolarBearEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java
index 9baddf321..5916c8b62 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.AbstractFishEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.AbstractFishEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java
index 38129d923..9228542f4 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java
index 6fa2b59df..9a8f8db9b 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java
index 8fa51d48f..d18d7acc1 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java
index e699cfa98..98555425f 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.google.common.collect.ImmutableList;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import it.unimi.dsi.fastutil.ints.IntList;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.AbstractFishEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.AbstractFishEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.List;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java
index 1eb0da891..06ef8a0ab 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/TurtleEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal;
+package org.geysermc.geyser.entity.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java
index 25e5eaaf7..92f6f9687 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/AbstractHorseEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.horse;
+package org.geysermc.geyser.entity.living.animal.horse;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.google.common.collect.ImmutableSet;
@@ -34,11 +34,11 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.attribute.GeyserAttributeType;
-import org.geysermc.connector.entity.living.animal.AnimalEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.entity.living.animal.AnimalEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.Set;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java
index 5ccbb4ea7..cf524cb38 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/ChestedHorseEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.horse;
+package org.geysermc.geyser.entity.living.animal.horse;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java
index d997171ea..25c323163 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/HorseEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.horse;
+package org.geysermc.geyser.entity.living.animal.horse;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java
index 7a4af6a2a..5934215b6 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.horse;
+package org.geysermc.geyser.entity.living.animal.horse;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.MobArmorEquipmentPacket;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java
index b8bfcdca6..1faed9e49 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/horse/TraderLlamaEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.horse;
+package org.geysermc.geyser.entity.living.animal.horse;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java
index 52f20b75f..a2604e931 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.tameable;
+package org.geysermc.geyser.entity.living.animal.tameable;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
@@ -31,9 +31,9 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntit
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/ParrotEntity.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/ParrotEntity.java
index 603303a65..b902ee1af 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/ParrotEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/ParrotEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.tameable;
+package org.geysermc.geyser.entity.living.animal.tameable;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/TameableEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/TameableEntity.java
index 198330ded..e08bdef9e 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/TameableEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/TameableEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.tameable;
+package org.geysermc.geyser.entity.living.animal.tameable;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
@@ -31,10 +31,10 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import lombok.Getter;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.animal.AnimalEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.animal.AnimalEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Optional;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/WolfEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/WolfEntity.java
index c38c1c8af..7a89b1153 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/WolfEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.animal.tameable;
+package org.geysermc.geyser.entity.living.animal.tameable;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -31,9 +31,9 @@ import com.google.common.collect.ImmutableSet;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.Set;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/merchant/AbstractMerchantEntity.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/merchant/AbstractMerchantEntity.java
index da7e0b357..70bed1ec2 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/merchant/AbstractMerchantEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.merchant;
+package org.geysermc.geyser.entity.living.merchant;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.AgeableEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.AgeableEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/merchant/VillagerEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/merchant/VillagerEntity.java
index c231e8e86..95a796e04 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/merchant/VillagerEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.merchant;
+package org.geysermc.geyser.entity.living.merchant;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
@@ -36,9 +36,9 @@ import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import lombok.Getter;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.BlockRegistries;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.BlockRegistries;
import java.util.Optional;
import java.util.UUID;
@@ -120,7 +120,7 @@ public class VillagerEntity extends AbstractMerchantEntity {
}
// The bed block
- int blockId = session.getConnector().getWorldManager().getBlockAt(session, bedPosition);
+ int blockId = session.getGeyser().getWorldManager().getBlockAt(session, bedPosition);
String fullIdentifier = BlockRegistries.JAVA_IDENTIFIERS.get().get(blockId);
// Set the correct position offset and rotation when sleeping
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/AbstractSkeletonEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/AbstractSkeletonEntity.java
index abbe8b6d3..993867ca9 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/AbstractSkeletonEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/AbstractSkeletonEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/BasePiglinEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/BasePiglinEntity.java
index a9b274875..664948bcd 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/BasePiglinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/BasePiglinEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.DimensionUtils;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/BlazeEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/BlazeEntity.java
index 5eed05db9..963cfb508 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/BlazeEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/BlazeEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/CreeperEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/CreeperEntity.java
index 0b05d8822..760cfb58e 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/CreeperEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/CreeperEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ElderGuardianEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/ElderGuardianEntity.java
index ce98218cd..f2cb030ed 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/ElderGuardianEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ElderGuardianEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonEntity.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonEntity.java
index 12d0c4f3a..379a166e9 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -33,11 +33,11 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.*;
import lombok.Data;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.Tickable;
-import org.geysermc.connector.entity.living.MobEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.Tickable;
+import org.geysermc.geyser.entity.living.MobEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.DimensionUtils;
import java.util.Random;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonPartEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonPartEntity.java
index ed1985057..088b7d721 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonPartEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/EnderDragonPartEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.network.session.GeyserSession;
public class EnderDragonPartEntity extends Entity {
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/EndermanEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/EndermanEntity.java
index 744e2480c..b007c1ced 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/EndermanEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
@@ -32,8 +32,8 @@ import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEvent2Packet;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/GhastEntity.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/GhastEntity.java
index 7c13ec577..ccb320311 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/GhastEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/GhastEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.FlyingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.FlyingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/GiantEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/GiantEntity.java
index 0b1f894f1..7f99d4de0 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/GiantEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/GiantEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/GuardianEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/GuardianEntity.java
index 0c4156e71..cbfeab8f2 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/GuardianEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/MonsterEntity.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/MonsterEntity.java
index d83b72cd0..e4b811b20 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/MonsterEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/MonsterEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.CreatureEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.CreatureEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/PhantomEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/PhantomEntity.java
index f9136f701..ba1975aed 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/PhantomEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/PhantomEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.FlyingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.FlyingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/PiglinEntity.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/PiglinEntity.java
index ab0625e64..1d1aa5652 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/PiglinEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ShulkerEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/ShulkerEntity.java
index e881e252f..047b272c2 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/ShulkerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ShulkerEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
@@ -31,9 +31,9 @@ import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.GolemEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.GolemEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/SkeletonEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/SkeletonEntity.java
index 63b021ba3..ce1ecb8be 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/SkeletonEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/SkeletonEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/SpiderEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/SpiderEntity.java
index 45e963618..9a51057d4 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/SpiderEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/SpiderEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/VexEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/VexEntity.java
index 2582665a7..ddd31c655 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/VexEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/VexEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/WitherEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/WitherEntity.java
index 0dd6565f2..ea889d573 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/WitherEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZoglinEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/ZoglinEntity.java
index 07876673d..cc5e21898 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZoglinEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieEntity.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieEntity.java
index d2b25ce8f..b52c888da 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieEntity.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieVillagerEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieVillagerEntity.java
index b78aff8d8..38472e03c 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombieVillagerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombieVillagerEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.VillagerData;
@@ -31,9 +31,9 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanE
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.merchant.VillagerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.merchant.VillagerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombifiedPiglinEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombifiedPiglinEntity.java
index ddfd3184b..8b25467f7 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/ZombifiedPiglinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/ZombifiedPiglinEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster;
+package org.geysermc.geyser.entity.living.monster;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/AbstractIllagerEntity.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/AbstractIllagerEntity.java
index 8350ae775..514ee276a 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/AbstractIllagerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/AbstractIllagerEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster.raid;
+package org.geysermc.geyser.entity.living.monster.raid;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/PillagerEntity.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/PillagerEntity.java
index d2cb661c6..6b4f97151 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/PillagerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/PillagerEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster.raid;
+package org.geysermc.geyser.entity.living.monster.raid;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/RaidParticipantEntity.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/RaidParticipantEntity.java
index fcfd50425..4e2fb2597 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/RaidParticipantEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/RaidParticipantEntity.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster.raid;
+package org.geysermc.geyser.entity.living.monster.raid;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.living.monster.MonsterEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.living.monster.MonsterEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/SpellcasterIllagerEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/SpellcasterIllagerEntity.java
index 6c91b1720..56099085f 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/SpellcasterIllagerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/SpellcasterIllagerEntity.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster.raid;
+package org.geysermc.geyser.entity.living.monster.raid;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/VindicatorEntity.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/VindicatorEntity.java
index db2225f37..49028dc23 100644
--- a/core/src/main/java/org/geysermc/connector/entity/living/monster/raid/VindicatorEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/living/monster/raid/VindicatorEntity.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.living.monster.raid;
+package org.geysermc.geyser.entity.living.monster.raid;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/player/PlayerEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/player/PlayerEntity.java
index 946ee2549..93b033118 100644
--- a/core/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/player/PlayerEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.player;
+package org.geysermc.geyser.entity.player;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
@@ -47,17 +47,17 @@ import com.nukkitx.protocol.bedrock.packet.*;
import lombok.Getter;
import lombok.Setter;
import net.kyori.adventure.text.Component;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.LivingEntity;
-import org.geysermc.connector.entity.living.animal.tameable.ParrotEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.scoreboard.Objective;
-import org.geysermc.connector.scoreboard.Score;
-import org.geysermc.connector.scoreboard.Team;
-import org.geysermc.connector.scoreboard.UpdateType;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.LivingEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.ParrotEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.scoreboard.Objective;
+import org.geysermc.geyser.scoreboard.Score;
+import org.geysermc.geyser.scoreboard.Team;
+import org.geysermc.geyser.scoreboard.UpdateType;
import javax.annotation.Nullable;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/player/SessionPlayerEntity.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/player/SessionPlayerEntity.java
index 9a367874e..ea0ec9cd3 100644
--- a/core/src/main/java/org/geysermc/connector/entity/player/SessionPlayerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/player/SessionPlayerEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.player;
+package org.geysermc.geyser.entity.player;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute;
@@ -38,9 +38,9 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import lombok.Getter;
-import org.geysermc.connector.entity.attribute.GeyserAttributeType;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.AttributeUtils;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.AttributeUtils;
import java.util.Collections;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/player/SkullPlayerEntity.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java
rename to core/src/main/java/org/geysermc/geyser/entity/player/SkullPlayerEntity.java
index e6c5cdfb3..d6054d528 100644
--- a/core/src/main/java/org/geysermc/connector/entity/player/SkullPlayerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/player/SkullPlayerEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.entity.player;
+package org.geysermc.geyser.entity.player;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.nukkitx.math.vector.Vector3f;
@@ -34,7 +34,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.AddPlayerPacket;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
/**
* A wrapper to handle skulls more effectively - skulls have to be treated as entities since there are no
diff --git a/core/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/AnvilContainer.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/AnvilContainer.java
index b4f5a6d36..343cff4ef 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/AnvilContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/AnvilContainer.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/BeaconContainer.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/BeaconContainer.java
index 7f6463714..5e9282d7f 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/BeaconContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/BeaconContainer.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/CartographyContainer.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/CartographyContainer.java
index 6743cd0c9..de7a861d5 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/CartographyContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/CartographyContainer.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/Container.java b/core/src/main/java/org/geysermc/geyser/inventory/Container.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/inventory/Container.java
rename to core/src/main/java/org/geysermc/geyser/inventory/Container.java
index d992ba224..48241a0e5 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/Container.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/Container.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import lombok.Getter;
import lombok.NonNull;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
/**
* Combination of {@link Inventory} and {@link PlayerInventory}
diff --git a/core/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/EnchantingContainer.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/EnchantingContainer.java
index 985f293ac..6be1f79c3 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/EnchantingContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/EnchantingContainer.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.EnchantOptionData;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java b/core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java
rename to core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java
index f709ad998..06cb88935 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/Generic3X3Container.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/Generic3X3Container.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public class Generic3X3Container extends Container {
/**
* Whether we need to set the container type as {@link com.nukkitx.protocol.bedrock.data.inventory.ContainerType#DROPPER}.
*
- * Used at {@link org.geysermc.connector.network.translators.inventory.translators.Generic3X3InventoryTranslator#openInventory(GeyserSession, Inventory)}
+ * Used at {@link org.geysermc.geyser.network.translators.inventory.translators.Generic3X3InventoryTranslator#openInventory(GeyserSession, Inventory)}
*/
@Getter
private boolean isDropper = false;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java b/core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java
rename to core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java
index 68f65f9af..5af40eb21 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/GeyserEnchantOption.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/GeyserEnchantOption.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.nukkitx.protocol.bedrock.data.inventory.EnchantData;
import com.nukkitx.protocol.bedrock.data.inventory.EnchantOptionData;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Arrays;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java b/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java
rename to core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java
index c2c17016c..82c6d89cc 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import lombok.Data;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
import javax.annotation.Nonnull;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/Inventory.java b/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/inventory/Inventory.java
rename to core/src/main/java/org/geysermc/geyser/inventory/Inventory.java
index 545585335..98e101ea7 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/Inventory.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
@@ -33,8 +33,8 @@ import com.nukkitx.math.vector.Vector3i;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Arrays;
@@ -96,7 +96,7 @@ public class Inventory {
public GeyserItemStack getItem(int slot) {
if (slot > this.size) {
- GeyserConnector.getInstance().getLogger().debug("Tried to get an item out of bounds! " + this);
+ GeyserImpl.getInstance().getLogger().debug("Tried to get an item out of bounds! " + this);
return GeyserItemStack.EMPTY;
}
return items[slot];
@@ -104,7 +104,7 @@ public class Inventory {
public void setItem(int slot, @NonNull GeyserItemStack newItem, GeyserSession session) {
if (slot > this.size) {
- session.getConnector().getLogger().debug("Tried to set an item out of bounds! " + this);
+ session.getGeyser().getLogger().debug("Tried to set an item out of bounds! " + this);
return;
}
GeyserItemStack oldItem = items[slot];
diff --git a/core/src/main/java/org/geysermc/connector/inventory/LecternContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/LecternContainer.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/inventory/LecternContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/LecternContainer.java
index 1a5ac635e..74d853ab6 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/LecternContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/LecternContainer.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.math.vector.Vector3i;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java
index fd3be0bd2..769a74028 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/MerchantContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/MerchantContainer.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.entity.Entity;
+import org.geysermc.geyser.entity.Entity;
@Getter
@Setter
diff --git a/core/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java b/core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java
rename to core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java
index 76b2e5fbe..8bc3d9c2d 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/PlayerInventory.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
public class PlayerInventory extends Inventory {
@@ -57,7 +57,7 @@ public class PlayerInventory extends Inventory {
public GeyserItemStack getItemInHand() {
if (36 + heldItemSlot > this.size) {
- GeyserConnector.getInstance().getLogger().debug("Held item slot was larger than expected!");
+ GeyserImpl.getInstance().getLogger().debug("Held item slot was larger than expected!");
return GeyserItemStack.EMPTY;
}
return items[36 + heldItemSlot];
@@ -65,7 +65,7 @@ public class PlayerInventory extends Inventory {
public void setItemInHand(@NonNull GeyserItemStack item) {
if (36 + heldItemSlot > this.size) {
- GeyserConnector.getInstance().getLogger().debug("Held item slot was larger than expected!");
+ GeyserImpl.getInstance().getLogger().debug("Held item slot was larger than expected!");
return;
}
items[36 + heldItemSlot] = item;
diff --git a/core/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java b/core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java
rename to core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java
index b818fe77d..576823118 100644
--- a/core/src/main/java/org/geysermc/connector/inventory/StonecutterContainer.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/StonecutterContainer.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.inventory;
+package org.geysermc.geyser.inventory;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public class StonecutterContainer extends Container {
/**
diff --git a/core/src/main/java/org/geysermc/connector/metrics/Metrics.java b/core/src/main/java/org/geysermc/geyser/metrics/Metrics.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/metrics/Metrics.java
rename to core/src/main/java/org/geysermc/geyser/metrics/Metrics.java
index b33afaec0..bc69cd65d 100644
--- a/core/src/main/java/org/geysermc/connector/metrics/Metrics.java
+++ b/core/src/main/java/org/geysermc/geyser/metrics/Metrics.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.metrics;
+package org.geysermc.geyser.metrics;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.geyser.GeyserImpl;
import javax.net.ssl.HttpsURLConnection;
import java.io.ByteArrayOutputStream;
@@ -76,19 +76,19 @@ public class Metrics {
private final static ObjectMapper mapper = new ObjectMapper();
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
/**
* Class constructor.
*
- * @param connector The GeyserConnector instance
+ * @param geyser The Geyser instance
* @param name The name of the server software.
* @param serverUUID The uuid of the server.
* @param logFailedRequests Whether failed requests should be logged or not.
* @param logger The logger for the failed requests.
*/
- public Metrics(GeyserConnector connector, String name, String serverUUID, boolean logFailedRequests, Logger logger) {
- this.connector = connector;
+ public Metrics(GeyserImpl geyser, String name, String serverUUID, boolean logFailedRequests, Logger logger) {
+ this.geyser = geyser;
this.name = name;
this.serverUUID = serverUUID;
Metrics.logFailedRequests = logFailedRequests;
@@ -114,7 +114,7 @@ public class Metrics {
* Starts the Scheduler which submits our data every 30 minutes.
*/
private void startSubmitting() {
- connector.getScheduledThread().scheduleAtFixedRate(this::submitData, 1, 30, TimeUnit.MINUTES);
+ geyser.getScheduledThread().scheduleAtFixedRate(this::submitData, 1, 30, TimeUnit.MINUTES);
// Submit the data every 30 minutes, first time after 1 minutes to give other plugins enough time to start
// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
// WARNING: Just don't do it!
@@ -129,7 +129,7 @@ public class Metrics {
ObjectNode data = mapper.createObjectNode();
data.put("pluginName", name); // Append the name of the server software
- data.put("pluginVersion", GeyserConnector.VERSION); // Append the name of the server software
+ data.put("pluginVersion", GeyserImpl.VERSION); // Append the name of the server software
ArrayNode customCharts = mapper.createArrayNode();
for (CustomChart customChart : charts) {
diff --git a/core/src/main/java/org/geysermc/connector/network/CIDRMatcher.java b/core/src/main/java/org/geysermc/geyser/network/CIDRMatcher.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/CIDRMatcher.java
rename to core/src/main/java/org/geysermc/geyser/network/CIDRMatcher.java
index 57e58ecc2..b29b12873 100644
--- a/core/src/main/java/org/geysermc/connector/network/CIDRMatcher.java
+++ b/core/src/main/java/org/geysermc/geyser/network/CIDRMatcher.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network;
+package org.geysermc.geyser.network;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/core/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java b/core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java
similarity index 77%
rename from core/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java
index bf7153319..fff852ad2 100644
--- a/core/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network;
+package org.geysermc.geyser.network;
import com.nukkitx.protocol.bedrock.BedrockPong;
import com.nukkitx.protocol.bedrock.BedrockServerEventHandler;
@@ -33,13 +33,13 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.DefaultEventLoopGroup;
import io.netty.channel.socket.DatagramPacket;
import io.netty.util.concurrent.DefaultThreadFactory;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.ping.GeyserPingInfo;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.ping.IGeyserPingPassthrough;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.common.ping.GeyserPingInfo;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.ping.IGeyserPingPassthrough;
+import org.geysermc.geyser.utils.LanguageUtils;
import javax.annotation.Nonnull;
import java.net.InetSocketAddress;
@@ -51,26 +51,26 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
The following constants are all used to ensure the ping does not reach a length where it is unparsable by the Bedrock client
*/
private static final int MINECRAFT_VERSION_BYTES_LENGTH = MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion().getBytes(StandardCharsets.UTF_8).length;
- private static final int BRAND_BYTES_LENGTH = GeyserConnector.NAME.getBytes(StandardCharsets.UTF_8).length;
+ private static final int BRAND_BYTES_LENGTH = GeyserImpl.NAME.getBytes(StandardCharsets.UTF_8).length;
/**
* The MOTD, sub-MOTD and Minecraft version ({@link #MINECRAFT_VERSION_BYTES_LENGTH}) combined cannot reach this length.
*/
private static final int MAGIC_RAKNET_LENGTH = 338;
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
// There is a constructor that doesn't require inputting threads, but older Netty versions don't have it
private final DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(0, new DefaultThreadFactory("Geyser player thread"));
- public ConnectorServerEventHandler(GeyserConnector connector) {
- this.connector = connector;
+ public ConnectorServerEventHandler(GeyserImpl geyser) {
+ this.geyser = geyser;
}
@Override
public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
- List allowedProxyIPs = connector.getConfig().getBedrock().getProxyProtocolWhitelistedIPs();
- if (connector.getConfig().getBedrock().isEnableProxyProtocol() && !allowedProxyIPs.isEmpty()) {
+ List allowedProxyIPs = geyser.getConfig().getBedrock().getProxyProtocolWhitelistedIPs();
+ if (geyser.getConfig().getBedrock().isEnableProxyProtocol() && !allowedProxyIPs.isEmpty()) {
boolean isWhitelistedIP = false;
- for (CIDRMatcher matcher : connector.getConfig().getBedrock().getWhitelistedIPsMatchers()) {
+ for (CIDRMatcher matcher : geyser.getConfig().getBedrock().getWhitelistedIPsMatchers()) {
if (matcher.matches(inetSocketAddress.getAddress())) {
isWhitelistedIP = true;
break;
@@ -82,21 +82,21 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
}
}
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.attempt_connect", inetSocketAddress));
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.attempt_connect", inetSocketAddress));
return true;
}
@Override
public BedrockPong onQuery(InetSocketAddress inetSocketAddress) {
- if (connector.getConfig().isDebugMode()) {
- connector.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.network.pinged", inetSocketAddress));
+ if (geyser.getConfig().isDebugMode()) {
+ geyser.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.network.pinged", inetSocketAddress));
}
- GeyserConfiguration config = connector.getConfig();
+ GeyserConfiguration config = geyser.getConfig();
GeyserPingInfo pingInfo = null;
if (config.isPassthroughMotd() || config.isPassthroughPlayerCounts()) {
- IGeyserPingPassthrough pingPassthrough = connector.getBootstrap().getGeyserPingPassthrough();
+ IGeyserPingPassthrough pingPassthrough = geyser.getBootstrap().getGeyserPingPassthrough();
pingInfo = pingPassthrough.getPingInformation(inetSocketAddress);
}
@@ -111,7 +111,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
if (config.isPassthroughMotd() && pingInfo != null && pingInfo.getDescription() != null) {
String[] motd = MessageTranslator.convertMessageLenient(pingInfo.getDescription()).split("\n");
String mainMotd = motd[0]; // First line of the motd.
- String subMotd = (motd.length != 1) ? motd[1] : GeyserConnector.NAME; // Second line of the motd if present, otherwise default.
+ String subMotd = (motd.length != 1) ? motd[1] : GeyserImpl.NAME; // Second line of the motd if present, otherwise default.
pong.setMotd(mainMotd.trim());
pong.setSubMotd(subMotd.trim()); // Trimmed to shift it to the left, prevents the universe from collapsing on us just because we went 2 characters over the text box's limit.
@@ -124,17 +124,17 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
pong.setPlayerCount(pingInfo.getPlayers().getOnline());
pong.setMaximumPlayerCount(pingInfo.getPlayers().getMax());
} else {
- pong.setPlayerCount(connector.getSessionManager().getSessions().size());
+ pong.setPlayerCount(geyser.getSessionManager().getSessions().size());
pong.setMaximumPlayerCount(config.getMaxPlayers());
}
// Fallbacks to prevent errors and allow Bedrock to see the server
if (pong.getMotd() == null || pong.getMotd().isBlank()) {
- pong.setMotd(GeyserConnector.NAME);
+ pong.setMotd(GeyserImpl.NAME);
}
if (pong.getSubMotd() == null || pong.getSubMotd().isBlank()) {
// Sub-MOTD cannot be empty as of 1.16.210.59
- pong.setSubMotd(GeyserConnector.NAME);
+ pong.setSubMotd(GeyserImpl.NAME);
}
// The ping will not appear if the MOTD + sub-MOTD is of a certain length.
@@ -144,7 +144,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
if (motdArray.length + subMotdLength > (MAGIC_RAKNET_LENGTH - MINECRAFT_VERSION_BYTES_LENGTH)) {
// Shorten the sub-MOTD first since that only appears locally
if (subMotdLength > BRAND_BYTES_LENGTH) {
- pong.setSubMotd(GeyserConnector.NAME);
+ pong.setSubMotd(GeyserImpl.NAME);
subMotdLength = BRAND_BYTES_LENGTH;
}
if (motdArray.length > (MAGIC_RAKNET_LENGTH - MINECRAFT_VERSION_BYTES_LENGTH - subMotdLength)) {
@@ -167,8 +167,8 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
@Override
public void onSessionCreation(BedrockServerSession bedrockServerSession) {
bedrockServerSession.setLogging(true);
- bedrockServerSession.setCompressionLevel(connector.getConfig().getBedrock().getCompressionLevel());
- bedrockServerSession.setPacketHandler(new UpstreamPacketHandler(connector, new GeyserSession(connector, bedrockServerSession, eventLoopGroup.next())));
+ bedrockServerSession.setCompressionLevel(geyser.getConfig().getBedrock().getCompressionLevel());
+ bedrockServerSession.setPacketHandler(new UpstreamPacketHandler(geyser, new GeyserSession(geyser, bedrockServerSession, eventLoopGroup.next())));
// Set the packet codec to default just in case we need to send disconnect packets.
bedrockServerSession.setPacketCodec(MinecraftProtocol.DEFAULT_BEDROCK_CODEC);
}
@@ -177,7 +177,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
public void onUnhandledDatagram(@Nonnull ChannelHandlerContext ctx, DatagramPacket packet) {
ByteBuf content = packet.content();
if (QueryPacketHandler.isQueryPacket(content)) {
- new QueryPacketHandler(connector, packet.sender(), content);
+ new QueryPacketHandler(geyser, packet.sender(), content);
}
}
}
\ No newline at end of file
diff --git a/core/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java
index 9be9dc9c8..83994f11c 100644
--- a/core/src/main/java/org/geysermc/connector/network/LoggingPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network;
+package org.geysermc.geyser.network;
import com.nukkitx.protocol.bedrock.BedrockPacket;
import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler;
import com.nukkitx.protocol.bedrock.packet.*;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
/**
* Bare bones implementation of BedrockPacketHandler suitable for extension.
@@ -38,16 +38,16 @@ import org.geysermc.connector.network.session.GeyserSession;
* packets of interest and limit boilerplate code.
*/
public class LoggingPacketHandler implements BedrockPacketHandler {
- protected final GeyserConnector connector;
+ protected final GeyserImpl geyser;
protected final GeyserSession session;
- LoggingPacketHandler(GeyserConnector connector, GeyserSession session) {
- this.connector = connector;
+ LoggingPacketHandler(GeyserImpl geyser, GeyserSession session) {
+ this.geyser = geyser;
this.session = session;
}
boolean defaultHandler(BedrockPacket packet) {
- connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName());
+ geyser.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName());
return false;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java b/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java
rename to core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java
index d513f28df..a9df533d5 100644
--- a/core/src/main/java/org/geysermc/connector/network/MinecraftProtocol.java
+++ b/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network;
+package org.geysermc.geyser.network;
import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
import com.github.steveice10.mc.protocol.codec.PacketCodec;
diff --git a/core/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java
similarity index 83%
rename from core/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java
index 7c696c36d..e29cf5627 100644
--- a/core/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/QueryPacketHandler.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network;
+package org.geysermc.geyser.network;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.ping.GeyserPingInfo;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.common.ping.GeyserPingInfo;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -49,7 +49,7 @@ public class QueryPacketHandler {
public static final byte HANDSHAKE = 0x09;
public static final byte STATISTICS = 0x00;
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
private final InetSocketAddress sender;
private final byte type;
private final int sessionId;
@@ -59,12 +59,12 @@ public class QueryPacketHandler {
* The Query packet handler instance. The unsigned short magic handshake should already be read at this point,
* and the packet should be verified to have enough buffer space to be a qualified query packet.
*
- * @param connector Geyser Connector
+ * @param geyser Geyser
* @param sender The Sender IP/Port for the Query
* @param buffer The Query data
*/
- public QueryPacketHandler(GeyserConnector connector, InetSocketAddress sender, ByteBuf buffer) {
- this.connector = connector;
+ public QueryPacketHandler(GeyserImpl geyser, InetSocketAddress sender, ByteBuf buffer) {
+ this.geyser = geyser;
this.sender = sender;
this.type = buffer.readByte();
this.sessionId = buffer.readInt();
@@ -143,31 +143,31 @@ public class QueryPacketHandler {
String maxPlayerCount;
String map;
- if (connector.getConfig().isPassthroughMotd() || connector.getConfig().isPassthroughPlayerCounts()) {
- pingInfo = connector.getBootstrap().getGeyserPingPassthrough().getPingInformation();
+ if (geyser.getConfig().isPassthroughMotd() || geyser.getConfig().isPassthroughPlayerCounts()) {
+ pingInfo = geyser.getBootstrap().getGeyserPingPassthrough().getPingInformation();
}
- if (connector.getConfig().isPassthroughMotd() && pingInfo != null) {
+ if (geyser.getConfig().isPassthroughMotd() && pingInfo != null) {
String[] javaMotd = MessageTranslator.convertMessageLenient(pingInfo.getDescription()).split("\n");
motd = javaMotd[0].trim(); // First line of the motd.
} else {
- motd = connector.getConfig().getBedrock().getMotd1();
+ motd = geyser.getConfig().getBedrock().getMotd1();
}
// If passthrough player counts is enabled lets get players from the server
- if (connector.getConfig().isPassthroughPlayerCounts() && pingInfo != null) {
+ if (geyser.getConfig().isPassthroughPlayerCounts() && pingInfo != null) {
currentPlayerCount = String.valueOf(pingInfo.getPlayers().getOnline());
maxPlayerCount = String.valueOf(pingInfo.getPlayers().getMax());
} else {
- currentPlayerCount = String.valueOf(connector.getSessionManager().getSessions().size());
- maxPlayerCount = String.valueOf(connector.getConfig().getMaxPlayers());
+ currentPlayerCount = String.valueOf(geyser.getSessionManager().getSessions().size());
+ maxPlayerCount = String.valueOf(geyser.getConfig().getMaxPlayers());
}
// If passthrough protocol name is enabled let's get the protocol name from the ping response.
- if (connector.getConfig().isPassthroughProtocolName() && pingInfo != null) {
+ if (geyser.getConfig().isPassthroughProtocolName() && pingInfo != null) {
map = pingInfo.getVersion().getName();
} else {
- map = GeyserConnector.NAME;
+ map = GeyserImpl.NAME;
}
// Create a hashmap of all game data needed in the query
@@ -175,13 +175,13 @@ public class QueryPacketHandler {
gameData.put("hostname", motd);
gameData.put("gametype", "SMP");
gameData.put("game_id", "MINECRAFT");
- gameData.put("version", GeyserConnector.NAME + " (" + GeyserConnector.GIT_VERSION + ") " + MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion());
+ gameData.put("version", GeyserImpl.NAME + " (" + GeyserImpl.GIT_VERSION + ") " + MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion());
gameData.put("plugins", "");
gameData.put("map", map);
gameData.put("numplayers", currentPlayerCount);
gameData.put("maxplayers", maxPlayerCount);
- gameData.put("hostport", String.valueOf(connector.getConfig().getBedrock().getPort()));
- gameData.put("hostip", connector.getConfig().getBedrock().getAddress());
+ gameData.put("hostport", String.valueOf(geyser.getConfig().getBedrock().getPort()));
+ gameData.put("hostip", geyser.getConfig().getBedrock().getAddress());
try {
writeString(query, "GeyserMC");
@@ -212,8 +212,8 @@ public class QueryPacketHandler {
ByteArrayOutputStream query = new ByteArrayOutputStream();
GeyserPingInfo pingInfo = null;
- if (connector.getConfig().isPassthroughMotd() || connector.getConfig().isPassthroughPlayerCounts()) {
- pingInfo = connector.getBootstrap().getGeyserPingPassthrough().getPingInformation();
+ if (geyser.getConfig().isPassthroughMotd() || geyser.getConfig().isPassthroughPlayerCounts()) {
+ pingInfo = geyser.getBootstrap().getGeyserPingPassthrough().getPingInformation();
}
try {
@@ -255,7 +255,7 @@ public class QueryPacketHandler {
* @param data packet data
*/
private void sendPacket(ByteBuf data) {
- connector.getBedrockServer().getRakNet().send(sender, data);
+ geyser.getBedrockServer().getRakNet().send(sender, data);
}
/**
diff --git a/core/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
index 773f2cc5c..701f42219 100644
--- a/core/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network;
+package org.geysermc.geyser.network;
import com.nukkitx.protocol.bedrock.BedrockPacket;
import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
@@ -31,22 +31,22 @@ import com.nukkitx.protocol.bedrock.data.ExperimentData;
import com.nukkitx.protocol.bedrock.data.ResourcePackType;
import com.nukkitx.protocol.bedrock.packet.*;
import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslatorRegistry;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.*;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslatorRegistry;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.*;
import java.io.FileInputStream;
import java.io.InputStream;
public class UpstreamPacketHandler extends LoggingPacketHandler {
- public UpstreamPacketHandler(GeyserConnector connector, GeyserSession session) {
- super(connector, session);
+ public UpstreamPacketHandler(GeyserImpl geyser, GeyserSession session) {
+ super(geyser, session);
}
private boolean translateAndDefault(BedrockPacket packet) {
@@ -60,7 +60,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
@Override
public boolean handle(LoginPacket loginPacket) {
- if (connector.isShuttingDown()) {
+ if (geyser.isShuttingDown()) {
// Don't allow new players in if we're no longer operating
session.disconnect(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.message"));
return true;
@@ -71,11 +71,11 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
String supportedVersions = MinecraftProtocol.getAllSupportedVersions();
if (loginPacket.getProtocolVersion() > MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
// Too early to determine session locale
- session.getConnector().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.outdated.server", supportedVersions));
+ session.getGeyser().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.outdated.server", supportedVersions));
session.disconnect(LanguageUtils.getLocaleStringLog("geyser.network.outdated.server", supportedVersions));
return true;
} else if (loginPacket.getProtocolVersion() < MinecraftProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
- session.getConnector().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.outdated.client", supportedVersions));
+ session.getGeyser().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.outdated.client", supportedVersions));
session.disconnect(LanguageUtils.getLocaleStringLog("geyser.network.outdated.client", supportedVersions));
return true;
}
@@ -93,7 +93,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS);
session.sendUpstreamPacket(playStatus);
- connector.getSessionManager().addPendingSession(session);
+ geyser.getSessionManager().addPendingSession(session);
ResourcePacksInfoPacket resourcePacksInfo = new ResourcePacksInfoPacket();
for(ResourcePack resourcePack : ResourcePack.PACKS.values()) {
@@ -102,7 +102,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
header.getUuid().toString(), header.getVersionString(), resourcePack.getFile().length(),
"", "", "", false, false));
}
- resourcePacksInfo.setForcedToAccept(GeyserConnector.getInstance().getConfig().isForceResourcePacks());
+ resourcePacksInfo.setForcedToAccept(GeyserImpl.getInstance().getConfig().isForceResourcePacks());
session.sendUpstreamPacket(resourcePacksInfo);
LanguageUtils.loadGeyserLocale(session.getLocale());
@@ -113,13 +113,13 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
public boolean handle(ResourcePackClientResponsePacket packet) {
switch (packet.getStatus()) {
case COMPLETED:
- if (connector.getConfig().getRemote().getAuthType() != AuthType.ONLINE) {
+ if (geyser.getConfig().getRemote().getAuthType() != AuthType.ONLINE) {
session.authenticate(session.getAuthData().getName());
} else if (!couldLoginUserByName(session.getAuthData().getName())) {
// We must spawn the white world
session.connect();
}
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.connect", session.getAuthData().getName()));
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.connect", session.getAuthData().getName()));
break;
case SEND_PACKS:
@@ -182,11 +182,11 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
}
private boolean couldLoginUserByName(String bedrockUsername) {
- if (connector.getConfig().getUserAuths() != null) {
- GeyserConfiguration.IUserAuthenticationInfo info = connector.getConfig().getUserAuths().get(bedrockUsername);
+ if (geyser.getConfig().getUserAuths() != null) {
+ GeyserConfiguration.IUserAuthenticationInfo info = geyser.getConfig().getUserAuths().get(bedrockUsername);
if (info != null) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.stored_credentials", session.getAuthData().getName()));
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.stored_credentials", session.getAuthData().getName()));
session.setMicrosoftAccount(info.isMicrosoftAccount());
session.authenticate(info.getEmail(), info.getPassword());
return true;
diff --git a/core/src/main/java/org/geysermc/geyser/network/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/network/session/GeyserSession.java
new file mode 100644
index 000000000..161ddb52e
--- /dev/null
+++ b/core/src/main/java/org/geysermc/geyser/network/session/GeyserSession.java
@@ -0,0 +1,1465 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.network.session;
+
+import com.github.steveice10.mc.auth.data.GameProfile;
+import com.github.steveice10.mc.auth.exception.request.AuthPendingException;
+import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException;
+import com.github.steveice10.mc.auth.exception.request.RequestException;
+import com.github.steveice10.mc.auth.service.AuthenticationService;
+import com.github.steveice10.mc.auth.service.MojangAuthenticationService;
+import com.github.steveice10.mc.auth.service.MsaAuthenticationService;
+import com.github.steveice10.mc.protocol.MinecraftConstants;
+import com.github.steveice10.mc.protocol.MinecraftProtocol;
+import com.github.steveice10.mc.protocol.data.ProtocolState;
+import com.github.steveice10.mc.protocol.data.UnexpectedEncryptionException;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose;
+import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
+import com.github.steveice10.mc.protocol.data.game.recipe.Recipe;
+import com.github.steveice10.mc.protocol.data.game.statistic.Statistic;
+import com.github.steveice10.mc.protocol.packet.handshake.serverbound.ClientIntentionPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerAbilitiesPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundAcceptTeleportationPacket;
+import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundCustomQueryPacket;
+import com.github.steveice10.packetlib.BuiltinFlags;
+import com.github.steveice10.packetlib.event.session.*;
+import com.github.steveice10.packetlib.packet.Packet;
+import com.github.steveice10.packetlib.tcp.TcpClientSession;
+import com.github.steveice10.packetlib.tcp.TcpSession;
+import com.nukkitx.math.GenericMath;
+import com.nukkitx.math.vector.*;
+import com.nukkitx.protocol.bedrock.BedrockPacket;
+import com.nukkitx.protocol.bedrock.BedrockServerSession;
+import com.nukkitx.protocol.bedrock.data.*;
+import com.nukkitx.protocol.bedrock.data.command.CommandPermission;
+import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
+import com.nukkitx.protocol.bedrock.packet.*;
+import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoop;
+import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import org.geysermc.common.PlatformType;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandSender;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.common.connection.LocalSession;
+import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.ItemFrameEntity;
+import org.geysermc.geyser.entity.Tickable;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.entity.player.SkullPlayerEntity;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.auth.AuthData;
+import org.geysermc.geyser.network.session.auth.BedrockClientData;
+import org.geysermc.geyser.network.session.cache.*;
+import org.geysermc.geyser.network.translators.PacketTranslatorRegistry;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.collision.CollisionManager;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.BlockMappings;
+import org.geysermc.geyser.registry.type.ItemMappings;
+import org.geysermc.geyser.skin.FloodgateSkinUploader;
+import org.geysermc.geyser.utils.*;
+import org.geysermc.cumulus.Form;
+import org.geysermc.cumulus.util.FormBuilder;
+import org.geysermc.floodgate.crypto.FloodgateCipher;
+import org.geysermc.floodgate.util.BedrockData;
+
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Getter
+public class GeyserSession implements CommandSender {
+
+ private final GeyserImpl geyser;
+ private final UpstreamSession upstream;
+ /**
+ * The loop where all packets and ticking is processed to prevent concurrency issues.
+ * If this is manually called, ensure that any exceptions are properly handled.
+ */
+ private final EventLoop eventLoop;
+ private TcpSession downstream;
+ @Setter
+ private AuthData authData;
+ @Setter
+ private BedrockClientData clientData;
+
+ /* Setter for GeyserConnect */
+ @Setter
+ private String remoteAddress;
+ @Setter
+ private int remotePort;
+ @Setter
+ private AuthType remoteAuthType;
+ /* Setter for GeyserConnect */
+
+ @Deprecated
+ @Setter
+ private boolean microsoftAccount;
+
+ private final SessionPlayerEntity playerEntity;
+
+ private final AdvancementsCache advancementsCache;
+ private final BookEditCache bookEditCache;
+ private final ChunkCache chunkCache;
+ private final EntityCache entityCache;
+ private final EntityEffectCache effectCache;
+ private final FormCache formCache;
+ private final LodestoneCache lodestoneCache;
+ private final PistonCache pistonCache;
+ private final PreferencesCache preferencesCache;
+ private final TagCache tagCache;
+ private final WorldCache worldCache;
+
+ private final Int2ObjectMap teleportMap = new Int2ObjectOpenHashMap<>();
+
+ private final WorldBorder worldBorder;
+ /**
+ * Whether simulated fog has been sent to the client or not.
+ */
+ private boolean isInWorldBorderWarningArea = false;
+
+ private final PlayerInventory playerInventory;
+ @Setter
+ private Inventory openInventory;
+ @Setter
+ private boolean closingInventory;
+
+ @Setter
+ private InventoryTranslator inventoryTranslator = InventoryTranslator.PLAYER_INVENTORY_TRANSLATOR;
+
+ /**
+ * Use {@link #getNextItemNetId()} instead for consistency
+ */
+ @Getter(AccessLevel.NONE)
+ private final AtomicInteger itemNetId = new AtomicInteger(2);
+
+ @Setter
+ private ScheduledFuture craftingGridFuture;
+
+ /**
+ * Stores session collision
+ */
+ private final CollisionManager collisionManager;
+
+ /**
+ * Stores the block mappings for this specific version.
+ */
+ @Setter
+ private BlockMappings blockMappings;
+
+ /**
+ * Stores the item translations for this specific version.
+ */
+ @Setter
+ private ItemMappings itemMappings;
+
+ private final Map skullCache = new Object2ObjectOpenHashMap<>();
+ private final Long2ObjectMap storedMaps = new Long2ObjectOpenHashMap<>();
+
+ /**
+ * Required to decode biomes correctly.
+ */
+ @Setter
+ private int biomeGlobalPalette;
+ /**
+ * Stores the map between Java and Bedrock biome network IDs.
+ */
+ private final Int2IntMap biomeTranslations = new Int2IntOpenHashMap();
+
+ /**
+ * A map of Vector3i positions to Java entities.
+ * Used for translating Bedrock block actions to Java entity actions.
+ */
+ private final Map itemFrameCache = new Object2ObjectOpenHashMap<>();
+
+ /**
+ * Stores a list of all lectern locations and their block entity tags.
+ * See {@link org.geysermc.geyser.network.translators.world.WorldManager#getLecternDataAt(GeyserSession, int, int, int, boolean)}
+ * for more information.
+ */
+ private final Set lecternCache;
+
+ @Setter
+ private boolean droppingLecternBook;
+
+ @Setter
+ private Vector2i lastChunkPosition = null;
+ private int renderDistance;
+
+ private boolean sentSpawnPacket;
+
+ private boolean loggedIn;
+ private boolean loggingIn;
+
+ @Setter
+ private boolean spawned;
+ /**
+ * Accessed on the initial Java and Bedrock packet processing threads
+ */
+ private volatile boolean closed;
+
+ @Setter
+ private GameMode gameMode = GameMode.SURVIVAL;
+
+ /**
+ * Keeps track of the world name for respawning.
+ */
+ @Setter
+ private String worldName = null;
+
+ private boolean sneaking;
+
+ /**
+ * Stores the Java pose that the server and/or Geyser believes the player currently has.
+ */
+ @Setter
+ private Pose pose = Pose.STANDING;
+
+ @Setter
+ private boolean sprinting;
+
+ /**
+ * Whether the player is swimming in water.
+ * Used to update speed when crawling.
+ */
+ @Setter
+ private boolean swimmingInWater;
+
+ /**
+ * Tracks the original speed attribute.
+ *
+ * We need to do this in order to emulate speeds when sneaking under 1.5-blocks-tall areas if the player isn't sneaking,
+ * and when crawling.
+ */
+ @Setter
+ private float originalSpeedAttribute;
+
+ /**
+ * The dimension of the player.
+ * As all entities are in the same world, this can be safely applied to all other entities.
+ */
+ @Setter
+ private String dimension = DimensionUtils.OVERWORLD;
+
+ @Setter
+ private int breakingBlock;
+
+ @Setter
+ private Vector3i lastBlockPlacePosition;
+
+ @Setter
+ private String lastBlockPlacedId;
+
+ @Setter
+ private boolean interacting;
+
+ /**
+ * Stores the last position of the block the player interacted with. This can either be a block that the client
+ * placed or an existing block the player interacted with (for example, a chest).
+ * Initialized as (0, 0, 0) so it is always not-null.
+ */
+ @Setter
+ private Vector3i lastInteractionBlockPosition = Vector3i.ZERO;
+
+ /**
+ * Stores the position of the player the last time they interacted.
+ * Used to verify that the player did not move since their last interaction.
+ * Initialized as (0, 0, 0) so it is always not-null.
+ */
+ @Setter
+ private Vector3f lastInteractionPlayerPosition = Vector3f.ZERO;
+
+ @Setter
+ private Entity ridingVehicleEntity;
+
+ /**
+ * The entity that the client is currently looking at.
+ */
+ @Setter
+ private Entity mouseoverEntity;
+
+ @Setter
+ private Int2ObjectMap craftingRecipes;
+ private final Set unlockedRecipes;
+ private final AtomicInteger lastRecipeNetId;
+
+ /**
+ * Saves a list of all stonecutter recipes, for use in a stonecutter inventory.
+ * The key is the Java ID of the item; the values are all the possible outputs' Java IDs sorted by their string identifier
+ */
+ @Setter
+ private Int2ObjectMap stonecutterRecipes;
+
+ /**
+ * The current attack speed of the player. Used for sending proper cooldown timings.
+ * Setting a default fixes cooldowns not showing up on a fresh world.
+ */
+ @Setter
+ private double attackSpeed = 4.0d;
+ /**
+ * The time of the last hit. Used to gauge how long the cooldown is taking.
+ * This is a session variable in order to prevent more scheduled threads than necessary.
+ */
+ @Setter
+ private long lastHitTime;
+
+ /**
+ * Saves if the client is steering left on a boat.
+ */
+ @Setter
+ private boolean steeringLeft;
+ /**
+ * Saves if the client is steering right on a boat.
+ */
+ @Setter
+ private boolean steeringRight;
+
+ /**
+ * Store the last time the player interacted. Used to fix a right-click spam bug.
+ * See https://github.com/GeyserMC/Geyser/issues/503 for context.
+ */
+ @Setter
+ private long lastInteractionTime;
+
+ /**
+ * Stores a future interaction to place a bucket. Will be cancelled if the client instead intended to
+ * interact with a block.
+ */
+ @Setter
+ private ScheduledFuture bucketScheduledFuture;
+
+ /**
+ * Used to send a movement packet every three seconds if the player hasn't moved. Prevents timeouts when AFK in certain instances.
+ */
+ @Setter
+ private long lastMovementTimestamp = System.currentTimeMillis();
+
+ /**
+ * Used to send a ServerboundMoveVehiclePacket for every PlayerInputPacket after idling on a boat/horse for more than 100ms
+ */
+ @Setter
+ private long lastVehicleMoveTimestamp = System.currentTimeMillis();
+
+ /**
+ * Controls whether the daylight cycle gamerule has been sent to the client, so the sun/moon remain motionless.
+ */
+ private boolean daylightCycle = true;
+
+ private boolean reducedDebugInfo = false;
+
+ /**
+ * The op permission level set by the server
+ */
+ @Setter
+ private int opPermissionLevel = 0;
+
+ /**
+ * If the current player can fly
+ */
+ @Setter
+ private boolean canFly = false;
+
+ /**
+ * If the current player is flying
+ */
+ private boolean flying = false;
+
+ /**
+ * Caches current rain status.
+ */
+ @Setter
+ private boolean raining = false;
+
+ /**
+ * Caches current thunder status.
+ */
+ @Setter
+ private boolean thunder = false;
+
+ /**
+ * Stores the last text inputted into a sign.
+ *
+ * Bedrock sends packets every time you update the sign, Java only wants the final packet.
+ * Until we determine that the user has finished editing, we save the sign's current status.
+ */
+ @Setter
+ private String lastSignMessage;
+
+ /**
+ * Stores a map of all statistics sent from the server.
+ * The server only sends new statistics back to us, so in order to show all statistics we need to cache existing ones.
+ */
+ private final Map statistics = new HashMap<>();
+
+ /**
+ * Whether we're expecting statistics to be sent back to us.
+ */
+ @Setter
+ private boolean waitingForStatistics = false;
+
+ private final Set emotes;
+
+ /**
+ * The thread that will run every 50 milliseconds - one Minecraft tick.
+ */
+ private ScheduledFuture tickThread = null;
+
+ private MinecraftProtocol protocol;
+
+ public GeyserSession(GeyserImpl geyser, BedrockServerSession bedrockServerSession, EventLoop eventLoop) {
+ this.geyser = geyser;
+ this.upstream = new UpstreamSession(bedrockServerSession);
+ this.eventLoop = eventLoop;
+
+ this.advancementsCache = new AdvancementsCache(this);
+ this.bookEditCache = new BookEditCache(this);
+ this.chunkCache = new ChunkCache(this);
+ this.entityCache = new EntityCache(this);
+ this.effectCache = new EntityEffectCache();
+ this.formCache = new FormCache(this);
+ this.lodestoneCache = new LodestoneCache();
+ this.pistonCache = new PistonCache(this);
+ this.preferencesCache = new PreferencesCache(this);
+ this.tagCache = new TagCache();
+ this.worldCache = new WorldCache(this);
+
+ this.worldBorder = new WorldBorder(this);
+
+ this.collisionManager = new CollisionManager(this);
+
+ this.playerEntity = new SessionPlayerEntity(this);
+ collisionManager.updatePlayerBoundingBox(this.playerEntity.getPosition());
+
+ this.playerInventory = new PlayerInventory();
+ this.openInventory = null;
+ this.craftingRecipes = new Int2ObjectOpenHashMap<>();
+ this.unlockedRecipes = new ObjectOpenHashSet<>();
+ this.lastRecipeNetId = new AtomicInteger(1);
+
+ this.spawned = false;
+ this.loggedIn = false;
+
+ if (geyser.getWorldManager().shouldExpectLecternHandled()) {
+ // Unneeded on these platforms
+ this.lecternCache = null;
+ } else {
+ this.lecternCache = new ObjectOpenHashSet<>();
+ }
+
+ if (geyser.getConfig().getEmoteOffhandWorkaround() != EmoteOffhandWorkaroundOption.NO_EMOTES) {
+ this.emotes = new HashSet<>();
+ geyser.getSessionManager().getSessions().values().forEach(player -> this.emotes.addAll(player.getEmotes()));
+ } else {
+ this.emotes = null;
+ }
+
+ bedrockServerSession.addDisconnectHandler(disconnectReason -> {
+ InetAddress address = bedrockServerSession.getRealAddress().getAddress();
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.disconnect", address, disconnectReason));
+
+ disconnect(disconnectReason.name());
+ geyser.getSessionManager().removeSession(this);
+ });
+
+ this.remoteAddress = geyser.getConfig().getRemote().getAddress();
+ this.remotePort = geyser.getConfig().getRemote().getPort();
+ this.remoteAuthType = geyser.getConfig().getRemote().getAuthType();
+ }
+
+ /**
+ * Send all necessary packets to load Bedrock into the server
+ */
+ public void connect() {
+ startGame();
+ sentSpawnPacket = true;
+
+ // Set the hardcoded shield ID to the ID we just defined in StartGamePacket
+ upstream.getSession().getHardcodedBlockingId().set(this.itemMappings.getStoredItems().shield().getBedrockId());
+
+ if (this.itemMappings.getFurnaceMinecartData() != null) {
+ ItemComponentPacket componentPacket = new ItemComponentPacket();
+ componentPacket.getItems().add(this.itemMappings.getFurnaceMinecartData());
+ upstream.sendPacket(componentPacket);
+ }
+
+ ChunkUtils.sendEmptyChunks(this, playerEntity.getPosition().toInt(), 0, false);
+
+ BiomeDefinitionListPacket biomeDefinitionListPacket = new BiomeDefinitionListPacket();
+ biomeDefinitionListPacket.setDefinitions(Registries.BIOMES_NBT.get());
+ upstream.sendPacket(biomeDefinitionListPacket);
+
+ AvailableEntityIdentifiersPacket entityPacket = new AvailableEntityIdentifiersPacket();
+ entityPacket.setIdentifiers(Registries.BEDROCK_ENTITY_IDENTIFIERS.get());
+ upstream.sendPacket(entityPacket);
+
+ CreativeContentPacket creativePacket = new CreativeContentPacket();
+ creativePacket.setContents(this.itemMappings.getCreativeItems());
+ upstream.sendPacket(creativePacket);
+
+ PlayStatusPacket playStatusPacket = new PlayStatusPacket();
+ playStatusPacket.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN);
+ upstream.sendPacket(playStatusPacket);
+
+ UpdateAttributesPacket attributesPacket = new UpdateAttributesPacket();
+ attributesPacket.setRuntimeEntityId(getPlayerEntity().getGeyserId());
+ // Default move speed
+ // Bedrock clients move very fast by default until they get an attribute packet correcting the speed
+ attributesPacket.setAttributes(Collections.singletonList(
+ new AttributeData("minecraft:movement", 0.0f, 1024f, 0.1f, 0.1f)));
+ upstream.sendPacket(attributesPacket);
+
+ GameRulesChangedPacket gamerulePacket = new GameRulesChangedPacket();
+ // Only allow the server to send health information
+ // Setting this to false allows natural regeneration to work false but doesn't break it being true
+ gamerulePacket.getGameRules().add(new GameRuleData<>("naturalregeneration", false));
+ // Don't let the client modify the inventory on death
+ // Setting this to true allows keep inventory to work if enabled but doesn't break functionality being false
+ gamerulePacket.getGameRules().add(new GameRuleData<>("keepinventory", true));
+ // Ensure client doesn't try and do anything funky; the server handles this for us
+ gamerulePacket.getGameRules().add(new GameRuleData<>("spawnradius", 0));
+ upstream.sendPacket(gamerulePacket);
+ }
+
+ public void login() {
+ if (this.remoteAuthType != AuthType.ONLINE) {
+ if (this.remoteAuthType == AuthType.OFFLINE) {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.offline"));
+ } else {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.floodgate"));
+ }
+ authenticate(authData.getName());
+ }
+ }
+
+ public void authenticate(String username) {
+ authenticate(username, "");
+ }
+
+ public void authenticate(String username, String password) {
+ if (loggedIn) {
+ geyser.getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.auth.already_loggedin", username));
+ return;
+ }
+
+ loggingIn = true;
+
+ // Use a future to prevent timeouts as all the authentication is handled sync
+ // This will be changed with the new protocol library.
+ CompletableFuture.supplyAsync(() -> {
+ try {
+ if (password != null && !password.isEmpty()) {
+ AuthenticationService authenticationService;
+ if (microsoftAccount) {
+ authenticationService = new MsaAuthenticationService(GeyserImpl.OAUTH_CLIENT_ID);
+ } else {
+ authenticationService = new MojangAuthenticationService();
+ }
+ authenticationService.setUsername(username);
+ authenticationService.setPassword(password);
+ authenticationService.login();
+
+ GameProfile profile = authenticationService.getSelectedProfile();
+ if (profile == null) {
+ // Java account is offline
+ disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
+ return null;
+ }
+
+ protocol = new MinecraftProtocol(profile, authenticationService.getAccessToken());
+ } else {
+ // always replace spaces when using Floodgate,
+ // as usernames with spaces cause issues with Bungeecord's login cycle.
+ // However, this doesn't affect the final username as Floodgate is still in charge of that.
+ // So if you have (for example) replace spaces enabled on Floodgate the spaces will re-appear.
+ String validUsername = username;
+ if (remoteAuthType == AuthType.FLOODGATE) {
+ validUsername = username.replace(' ', '_');
+ }
+
+ protocol = new MinecraftProtocol(validUsername);
+ }
+ } catch (InvalidCredentialsException | IllegalArgumentException e) {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.invalid", username));
+ disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.invalid.kick", getClientData().getLanguageCode()));
+ } catch (RequestException ex) {
+ disconnect(ex.getMessage());
+ }
+ return null;
+ }).whenComplete((aVoid, ex) -> {
+ if (ex != null) {
+ disconnect(ex.toString());
+ }
+ if (this.closed) {
+ if (ex != null) {
+ geyser.getLogger().error("", ex);
+ }
+ // Client disconnected during the authentication attempt
+ return;
+ }
+
+ connectDownstream();
+ });
+ }
+
+ /**
+ * Present a form window to the user asking to log in with another web browser
+ */
+ public void authenticateWithMicrosoftCode() {
+ if (loggedIn) {
+ geyser.getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.auth.already_loggedin", getAuthData().getName()));
+ return;
+ }
+
+ loggingIn = true;
+
+ // This just looks cool
+ SetTimePacket packet = new SetTimePacket();
+ packet.setTime(16000);
+ sendUpstreamPacket(packet);
+
+ // new thread so clients don't timeout
+ MsaAuthenticationService msaAuthenticationService = new MsaAuthenticationService(GeyserImpl.OAUTH_CLIENT_ID);
+
+ // Use a future to prevent timeouts as all the authentication is handled sync
+ // This will be changed with the new protocol library.
+ CompletableFuture.supplyAsync(() -> {
+ try {
+ return msaAuthenticationService.getAuthCode();
+ } catch (RequestException e) {
+ throw new CompletionException(e);
+ }
+ }).whenComplete((response, ex) -> {
+ if (ex != null) {
+ ex.printStackTrace();
+ disconnect(ex.toString());
+ return;
+ }
+ LoginEncryptionUtils.buildAndShowMicrosoftCodeWindow(this, response);
+ attemptCodeAuthentication(msaAuthenticationService);
+ });
+ }
+
+ /**
+ * Poll every second to see if the user has successfully signed in
+ */
+ private void attemptCodeAuthentication(MsaAuthenticationService msaAuthenticationService) {
+ if (loggedIn || closed) {
+ return;
+ }
+ CompletableFuture.supplyAsync(() -> {
+ try {
+ msaAuthenticationService.login();
+ GameProfile profile = msaAuthenticationService.getSelectedProfile();
+ if (profile == null) {
+ // Java account is offline
+ disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
+ return null;
+ }
+
+ return new MinecraftProtocol(profile, msaAuthenticationService.getAccessToken());
+ } catch (RequestException e) {
+ throw new CompletionException(e);
+ }
+ }).whenComplete((response, ex) -> {
+ if (ex != null) {
+ if (!(ex instanceof CompletionException completionException) || !(completionException.getCause() instanceof AuthPendingException)) {
+ geyser.getLogger().error("Failed to log in with Microsoft code!", ex);
+ disconnect(ex.toString());
+ } else {
+ // Wait one second before trying again
+ geyser.getScheduledThread().schedule(() -> attemptCodeAuthentication(msaAuthenticationService), 1, TimeUnit.SECONDS);
+ }
+ return;
+ }
+ if (!closed) {
+ this.protocol = response;
+ connectDownstream();
+ }
+ });
+ }
+
+ /**
+ * After getting whatever credentials needed, we attempt to join the Java server.
+ */
+ private void connectDownstream() {
+ boolean floodgate = this.remoteAuthType == AuthType.FLOODGATE;
+
+ // Start ticking
+ tickThread = eventLoop.scheduleAtFixedRate(this::tick, 50, 50, TimeUnit.MILLISECONDS);
+
+ if (geyser.getBootstrap().getSocketAddress() != null) {
+ // We're going to connect through the JVM and not through TCP
+ downstream = new LocalSession(this.remoteAddress, this.remotePort,
+ geyser.getBootstrap().getSocketAddress(), upstream.getAddress().getAddress().getHostAddress(), this.protocol);
+ } else {
+ downstream = new TcpClientSession(this.remoteAddress, this.remotePort, this.protocol);
+ disableSrvResolving();
+ }
+
+ if (geyser.getConfig().getRemote().isUseProxyProtocol()) {
+ downstream.setFlag(BuiltinFlags.ENABLE_CLIENT_PROXY_PROTOCOL, true);
+ downstream.setFlag(BuiltinFlags.CLIENT_PROXIED_ADDRESS, upstream.getAddress());
+ }
+ if (geyser.getConfig().isForwardPlayerPing()) {
+ // Let Geyser handle sending the keep alive
+ downstream.setFlag(MinecraftConstants.AUTOMATIC_KEEP_ALIVE_MANAGEMENT, false);
+ }
+ downstream.addListener(new SessionAdapter() {
+ @Override
+ public void packetSending(PacketSendingEvent event) {
+ //todo move this somewhere else
+ if (event.getPacket() instanceof ClientIntentionPacket) {
+ String addressSuffix;
+ if (floodgate) {
+ byte[] encryptedData;
+
+ try {
+ FloodgateSkinUploader skinUploader = geyser.getSkinUploader();
+ FloodgateCipher cipher = geyser.getCipher();
+
+ encryptedData = cipher.encryptFromString(BedrockData.of(
+ clientData.getGameVersion(),
+ authData.getName(),
+ authData.getXuid(),
+ clientData.getDeviceOs().ordinal(),
+ clientData.getLanguageCode(),
+ clientData.getUiProfile().ordinal(),
+ clientData.getCurrentInputMode().ordinal(),
+ upstream.getAddress().getAddress().getHostAddress(),
+ skinUploader.getId(),
+ skinUploader.getVerifyCode(),
+ geyser.getTimeSyncer()
+ ).toString());
+
+ if (!geyser.getTimeSyncer().hasUsefulOffset()) {
+ geyser.getLogger().warning(
+ "We couldn't make sure that your system clock is accurate. " +
+ "This can cause issues with logging in."
+ );
+ }
+
+ } catch (Exception e) {
+ geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.encrypt_fail"), e);
+ disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.floodgate.encryption_fail", getClientData().getLanguageCode()));
+ return;
+ }
+
+ addressSuffix = '\0' + new String(encryptedData, StandardCharsets.UTF_8);
+ } else {
+ addressSuffix = "";
+ }
+
+ ClientIntentionPacket intentionPacket = event.getPacket();
+
+ String address;
+ if (geyser.getConfig().getRemote().isForwardHost()) {
+ address = clientData.getServerAddress().split(":")[0];
+ } else {
+ address = intentionPacket.getHostname();
+ }
+
+ event.setPacket(intentionPacket.withHostname(address + addressSuffix));
+ }
+ }
+
+ @Override
+ public void connected(ConnectedEvent event) {
+ loggingIn = false;
+ loggedIn = true;
+
+ if (downstream instanceof LocalSession) {
+ // Connected directly to the server
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect_internal",
+ authData.getName(), protocol.getProfile().getName()));
+ } else {
+ // Connected to an IP address
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect",
+ authData.getName(), protocol.getProfile().getName(), remoteAddress));
+ }
+
+ UUID uuid = protocol.getProfile().getId();
+ if (uuid == null) {
+ // Set what our UUID *probably* is going to be
+ if (remoteAuthType == AuthType.FLOODGATE) {
+ uuid = new UUID(0, Long.parseLong(authData.getXuid()));
+ } else {
+ uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + protocol.getProfile().getName()).getBytes(StandardCharsets.UTF_8));
+ }
+ }
+ playerEntity.setUuid(uuid);
+ playerEntity.setUsername(protocol.getProfile().getName());
+
+ String locale = clientData.getLanguageCode();
+
+ // Let the user know there locale may take some time to download
+ // as it has to be extracted from a JAR
+ if (locale.equalsIgnoreCase("en_us") && !LocaleUtils.LOCALE_MAPPINGS.containsKey("en_us")) {
+ // This should probably be left hardcoded as it will only show for en_us clients
+ sendMessage("Loading your locale (en_us); if this isn't already downloaded, this may take some time");
+ }
+
+ // Download and load the language for the player
+ LocaleUtils.downloadAndLoadLocale(locale);
+ }
+
+ @Override
+ public void disconnected(DisconnectedEvent event) {
+ loggingIn = false;
+ loggedIn = false;
+
+ String disconnectMessage;
+ Throwable cause = event.getCause();
+ if (cause instanceof UnexpectedEncryptionException) {
+ if (remoteAuthType != AuthType.FLOODGATE) {
+ // Server expects online mode
+ disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.authentication_type_mismatch", getLocale());
+ // Explain that they may be looking for Floodgate.
+ geyser.getLogger().warning(LanguageUtils.getLocaleStringLog(
+ geyser.getPlatformType() == PlatformType.STANDALONE ?
+ "geyser.network.remote.floodgate_explanation_standalone"
+ : "geyser.network.remote.floodgate_explanation_plugin",
+ Constants.FLOODGATE_DOWNLOAD_LOCATION
+ ));
+ } else {
+ // Likely that Floodgate is not configured correctly.
+ disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.floodgate_login_error", getLocale());
+ if (geyser.getPlatformType() == PlatformType.STANDALONE) {
+ geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.remote.floodgate_login_error_standalone"));
+ }
+ }
+ } else if (cause instanceof ConnectException) {
+ // Server is offline, probably
+ disconnectMessage = LanguageUtils.getPlayerLocaleString("geyser.network.remote.server_offline", getLocale());
+ } else {
+ disconnectMessage = MessageTranslator.convertMessageLenient(event.getReason());
+ }
+
+ if (downstream instanceof LocalSession) {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.disconnect_internal", authData.getName(), disconnectMessage));
+ } else {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.disconnect", authData.getName(), remoteAddress, disconnectMessage));
+ }
+ if (cause != null) {
+ cause.printStackTrace();
+ }
+
+ upstream.disconnect(disconnectMessage);
+ }
+
+ @Override
+ public void packetReceived(PacketReceivedEvent event) {
+ Packet packet = event.getPacket();
+ PacketTranslatorRegistry.JAVA_TRANSLATOR.translate(packet.getClass(), packet, GeyserSession.this);
+ }
+
+ @Override
+ public void packetError(PacketErrorEvent event) {
+ geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.downstream_error", event.getCause().getMessage()));
+ if (geyser.getConfig().isDebugMode())
+ event.getCause().printStackTrace();
+ event.setSuppress(true);
+ }
+ });
+
+ if (!daylightCycle) {
+ setDaylightCycle(true);
+ }
+
+ downstream.connect();
+ }
+
+ public void disconnect(String reason) {
+ if (!closed) {
+ loggedIn = false;
+ if (downstream != null) {
+ downstream.disconnect(reason);
+ }
+ if (upstream != null && !upstream.isClosed()) {
+ geyser.getSessionManager().removeSession(this);
+ upstream.disconnect(reason);
+ }
+ }
+
+ if (tickThread != null) {
+ tickThread.cancel(false);
+ }
+
+ closed = true;
+ }
+
+ public void close() {
+ disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.close", getClientData().getLanguageCode()));
+ }
+
+ /**
+ * Executes a task and prints a stack trace if an error occurs.
+ */
+ public void executeInEventLoop(Runnable runnable) {
+ eventLoop.execute(() -> {
+ try {
+ runnable.run();
+ } catch (Throwable e) {
+ geyser.getLogger().error("Error thrown in " + getName() + "'s event loop!", e);
+ }
+ });
+ }
+
+ /**
+ * Schedules a task and prints a stack trace if an error occurs.
+ */
+ public ScheduledFuture scheduleInEventLoop(Runnable runnable, long duration, TimeUnit timeUnit) {
+ return eventLoop.schedule(() -> {
+ try {
+ runnable.run();
+ } catch (Throwable e) {
+ geyser.getLogger().error("Error thrown in " + getName() + "'s event loop!", e);
+ }
+ }, duration, timeUnit);
+ }
+
+ /**
+ * Called every 50 milliseconds - one Minecraft tick.
+ */
+ protected void tick() {
+ try {
+ pistonCache.tick();
+ // Check to see if the player's position needs updating - a position update should be sent once every 3 seconds
+ if (spawned && (System.currentTimeMillis() - lastMovementTimestamp) > 3000) {
+ // Recalculate in case something else changed position
+ Vector3d position = collisionManager.adjustBedrockPosition(playerEntity.getPosition(), playerEntity.isOnGround(), false);
+ // A null return value cancels the packet
+ if (position != null) {
+ ServerboundMovePlayerPosPacket packet = new ServerboundMovePlayerPosPacket(playerEntity.isOnGround(),
+ position.getX(), position.getY(), position.getZ());
+ sendDownstreamPacket(packet);
+ }
+ lastMovementTimestamp = System.currentTimeMillis();
+ }
+
+ if (worldBorder.isResizing()) {
+ worldBorder.resize();
+ }
+
+ if (!worldBorder.isWithinWarningBoundaries()) {
+ // Show particles representing where the world border is
+ worldBorder.drawWall();
+ // Set the mood
+ if (!isInWorldBorderWarningArea) {
+ isInWorldBorderWarningArea = true;
+ WorldBorder.sendFog(this, "minecraft:fog_crimson_forest");
+ }
+ } else if (isInWorldBorderWarningArea) {
+ // Clear fog as we are outside the world border now
+ WorldBorder.removeFog(this);
+ isInWorldBorderWarningArea = false;
+ }
+
+
+ for (Tickable entity : entityCache.getTickableEntities()) {
+ entity.tick();
+ }
+ } catch (Throwable throwable) {
+ throwable.printStackTrace();
+ }
+ }
+
+ public void setAuthenticationData(AuthData authData) {
+ this.authData = authData;
+ }
+
+ public void setSneaking(boolean sneaking) {
+ this.sneaking = sneaking;
+
+ // Update pose and bounding box on our end
+ AttributeData speedAttribute;
+ if (!sneaking && (speedAttribute = adjustSpeed()) != null) {
+ // Update attributes since we're still "sneaking" under a 1.5-block-tall area
+ UpdateAttributesPacket attributesPacket = new UpdateAttributesPacket();
+ attributesPacket.setRuntimeEntityId(playerEntity.getGeyserId());
+ attributesPacket.setAttributes(Collections.singletonList(speedAttribute));
+ sendUpstreamPacket(attributesPacket);
+ // the server *should* update our pose once it has returned to normal
+ } else {
+ if (!flying) {
+ // The pose and bounding box should not be updated if the player is flying
+ setSneakingPose(sneaking);
+ }
+ collisionManager.updateScaffoldingFlags(false);
+ }
+
+ playerEntity.updateBedrockMetadata();
+
+ if (mouseoverEntity != null) {
+ // Horses, etc can change their property depending on if you're sneaking
+ InteractiveTagManager.updateTag(this, mouseoverEntity);
+ }
+ }
+
+ private void setSneakingPose(boolean sneaking) {
+ this.pose = sneaking ? Pose.SNEAKING : Pose.STANDING;
+ playerEntity.getDirtyMetadata().put(EntityData.BOUNDING_BOX_HEIGHT, sneaking ? 1.5f : playerEntity.getDefinition().height());
+ playerEntity.setFlag(EntityFlag.SNEAKING, sneaking);
+
+ collisionManager.updatePlayerBoundingBox();
+ }
+
+ public void setSwimming(boolean swimming) {
+ this.pose = swimming ? Pose.SWIMMING : Pose.STANDING;
+ playerEntity.getDirtyMetadata().put(EntityData.BOUNDING_BOX_HEIGHT, swimming ? 0.6f : playerEntity.getDefinition().height());
+ playerEntity.setFlag(EntityFlag.SWIMMING, swimming);
+ playerEntity.updateBedrockMetadata();
+ }
+
+ public void setFlying(boolean flying) {
+ this.flying = flying;
+
+ if (sneaking) {
+ // update bounding box as it is not reduced when flying
+ setSneakingPose(!flying);
+ playerEntity.updateBedrockMetadata();
+ }
+ }
+
+ /**
+ * Adjusts speed if the player is crawling.
+ *
+ * @return not null if attributes should be updated.
+ */
+ public AttributeData adjustSpeed() {
+ AttributeData currentPlayerSpeed = playerEntity.getAttributes().get(GeyserAttributeType.MOVEMENT_SPEED);
+ if (currentPlayerSpeed != null) {
+ if ((pose.equals(Pose.SNEAKING) && !sneaking && collisionManager.isUnderSlab()) ||
+ (!swimmingInWater && playerEntity.getFlag(EntityFlag.SWIMMING) && !collisionManager.isPlayerInWater())) {
+ // Either of those conditions means that Bedrock goes zoom when they shouldn't be
+ AttributeData speedAttribute = GeyserAttributeType.MOVEMENT_SPEED.getAttribute(originalSpeedAttribute / 3.32f);
+ playerEntity.getAttributes().put(GeyserAttributeType.MOVEMENT_SPEED, speedAttribute);
+ return speedAttribute;
+ } else if (originalSpeedAttribute != currentPlayerSpeed.getValue()) {
+ // Speed has reset to normal
+ AttributeData speedAttribute = GeyserAttributeType.MOVEMENT_SPEED.getAttribute(originalSpeedAttribute);
+ playerEntity.getAttributes().put(GeyserAttributeType.MOVEMENT_SPEED, speedAttribute);
+ return speedAttribute;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Will be overwritten for GeyserConnect.
+ */
+ protected void disableSrvResolving() {
+ this.downstream.setFlag(BuiltinFlags.ATTEMPT_SRV_RESOLVE, false);
+ }
+
+ @Override
+ public String getName() {
+ return authData.getName();
+ }
+
+ @Override
+ public void sendMessage(String message) {
+ TextPacket textPacket = new TextPacket();
+ textPacket.setPlatformChatId("");
+ textPacket.setSourceName("");
+ textPacket.setXuid("");
+ textPacket.setType(TextPacket.Type.CHAT);
+ textPacket.setNeedsTranslation(false);
+ textPacket.setMessage(message);
+
+ upstream.sendPacket(textPacket);
+ }
+
+ @Override
+ public boolean isConsole() {
+ return false;
+ }
+
+ @Override
+ public String getLocale() {
+ return clientData.getLanguageCode();
+ }
+
+ public void setRenderDistance(int renderDistance) {
+ renderDistance = GenericMath.ceil(++renderDistance * MathUtils.SQRT_OF_TWO); //square to circle
+ this.renderDistance = renderDistance;
+
+ ChunkRadiusUpdatedPacket chunkRadiusUpdatedPacket = new ChunkRadiusUpdatedPacket();
+ chunkRadiusUpdatedPacket.setRadius(renderDistance);
+ upstream.sendPacket(chunkRadiusUpdatedPacket);
+ }
+
+ public InetSocketAddress getSocketAddress() {
+ return this.upstream.getAddress();
+ }
+
+ public void sendForm(Form form) {
+ formCache.showForm(form);
+ }
+
+ public void sendForm(FormBuilder formBuilder) {
+ formCache.showForm(formBuilder.build());
+ }
+
+ private void startGame() {
+ StartGamePacket startGamePacket = new StartGamePacket();
+ startGamePacket.setUniqueEntityId(playerEntity.getGeyserId());
+ startGamePacket.setRuntimeEntityId(playerEntity.getGeyserId());
+ startGamePacket.setPlayerGameType(switch (gameMode) {
+ case CREATIVE -> GameType.CREATIVE;
+ case ADVENTURE -> GameType.ADVENTURE;
+ default -> GameType.SURVIVAL;
+ });
+ startGamePacket.setPlayerPosition(Vector3f.from(0, 69, 0));
+ startGamePacket.setRotation(Vector2f.from(1, 1));
+
+ startGamePacket.setSeed(-1);
+ startGamePacket.setDimensionId(DimensionUtils.javaToBedrock(dimension));
+ startGamePacket.setGeneratorId(1);
+ startGamePacket.setLevelGameType(GameType.SURVIVAL);
+ startGamePacket.setDifficulty(1);
+ startGamePacket.setDefaultSpawn(Vector3i.ZERO);
+ startGamePacket.setAchievementsDisabled(!geyser.getConfig().isXboxAchievementsEnabled());
+ startGamePacket.setCurrentTick(-1);
+ startGamePacket.setEduEditionOffers(0);
+ startGamePacket.setEduFeaturesEnabled(false);
+ startGamePacket.setRainLevel(0);
+ startGamePacket.setLightningLevel(0);
+ startGamePacket.setMultiplayerGame(true);
+ startGamePacket.setBroadcastingToLan(true);
+ startGamePacket.setPlatformBroadcastMode(GamePublishSetting.PUBLIC);
+ startGamePacket.setXblBroadcastMode(GamePublishSetting.PUBLIC);
+ startGamePacket.setCommandsEnabled(!geyser.getConfig().isXboxAchievementsEnabled());
+ startGamePacket.setTexturePacksRequired(false);
+ startGamePacket.setBonusChestEnabled(false);
+ startGamePacket.setStartingWithMap(false);
+ startGamePacket.setTrustingPlayers(true);
+ startGamePacket.setDefaultPlayerPermission(PlayerPermission.MEMBER);
+ startGamePacket.setServerChunkTickRange(4);
+ startGamePacket.setBehaviorPackLocked(false);
+ startGamePacket.setResourcePackLocked(false);
+ startGamePacket.setFromLockedWorldTemplate(false);
+ startGamePacket.setUsingMsaGamertagsOnly(false);
+ startGamePacket.setFromWorldTemplate(false);
+ startGamePacket.setWorldTemplateOptionLocked(false);
+
+ String serverName = geyser.getConfig().getBedrock().getServerName();
+ startGamePacket.setLevelId(serverName);
+ startGamePacket.setLevelName(serverName);
+
+ startGamePacket.setPremiumWorldTemplateId("00000000-0000-0000-0000-000000000000");
+ // startGamePacket.setCurrentTick(0);
+ startGamePacket.setEnchantmentSeed(0);
+ startGamePacket.setMultiplayerCorrelationId("");
+ startGamePacket.setItemEntries(this.itemMappings.getItemEntries());
+ startGamePacket.setVanillaVersion("*");
+ startGamePacket.setInventoriesServerAuthoritative(true);
+ startGamePacket.setServerEngine(""); // Do we want to fill this in?
+
+ SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings();
+ settings.setMovementMode(AuthoritativeMovementMode.CLIENT);
+ settings.setRewindHistorySize(0);
+ settings.setServerAuthoritativeBlockBreaking(false);
+ startGamePacket.setPlayerMovementSettings(settings);
+
+ if (upstream.getProtocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) {
+ startGamePacket.getExperiments().add(new ExperimentData("caves_and_cliffs", true));
+ }
+
+ upstream.sendPacket(startGamePacket);
+ }
+
+ /**
+ * @return the next Bedrock item network ID to use for a new item
+ */
+ public int getNextItemNetId() {
+ return itemNetId.getAndIncrement();
+ }
+
+ public void addTeleport(TeleportCache teleportCache) {
+ teleportMap.put(teleportCache.getTeleportConfirmId(), teleportCache);
+
+ ObjectIterator> it = teleportMap.int2ObjectEntrySet().iterator();
+
+ // Remove any teleports with a higher number - maybe this is a world change that reset the ID to 0?
+ while (it.hasNext()) {
+ Int2ObjectMap.Entry entry = it.next();
+ int nextID = entry.getValue().getTeleportConfirmId();
+ if (nextID > teleportCache.getTeleportConfirmId()) {
+ it.remove();
+ }
+ }
+ }
+
+ public void confirmTeleport(Vector3d position) {
+ if (teleportMap.size() == 0) {
+ return;
+ }
+ int teleportID = -1;
+
+ for (Int2ObjectMap.Entry entry : teleportMap.int2ObjectEntrySet()) {
+ if (entry.getValue().canConfirm(position)) {
+ if (entry.getValue().getTeleportConfirmId() > teleportID) {
+ teleportID = entry.getValue().getTeleportConfirmId();
+ }
+ }
+ }
+
+ if (teleportID != -1) {
+ ObjectIterator> it = teleportMap.int2ObjectEntrySet().iterator();
+
+ // Confirm the current teleport and any earlier ones
+ while (it.hasNext()) {
+ TeleportCache entry = it.next().getValue();
+ int nextID = entry.getTeleportConfirmId();
+ if (nextID <= teleportID) {
+ ServerboundAcceptTeleportationPacket teleportConfirmPacket = new ServerboundAcceptTeleportationPacket(nextID);
+ sendDownstreamPacket(teleportConfirmPacket);
+ // Servers (especially ones like Hypixel) expect exact coordinates given back to them.
+ ServerboundMovePlayerPosRotPacket positionPacket = new ServerboundMovePlayerPosRotPacket(playerEntity.isOnGround(),
+ entry.getX(), entry.getY(), entry.getZ(), entry.getYaw(), entry.getPitch());
+ sendDownstreamPacket(positionPacket);
+ it.remove();
+ geyser.getLogger().debug("Confirmed teleport " + nextID);
+ }
+ }
+ }
+
+ if (teleportMap.size() > 0) {
+ int resendID = -1;
+ for (Int2ObjectMap.Entry entry : teleportMap.int2ObjectEntrySet()) {
+ TeleportCache teleport = entry.getValue();
+ teleport.incrementUnconfirmedFor();
+ if (teleport.shouldResend()) {
+ if (teleport.getTeleportConfirmId() >= resendID) {
+ resendID = teleport.getTeleportConfirmId();
+ }
+ }
+ }
+
+ if (resendID != -1) {
+ geyser.getLogger().debug("Resending teleport " + resendID);
+ TeleportCache teleport = teleportMap.get(resendID);
+ getPlayerEntity().moveAbsolute(Vector3f.from(teleport.getX(), teleport.getY(), teleport.getZ()),
+ teleport.getYaw(), teleport.getPitch(), playerEntity.isOnGround(), true);
+ }
+ }
+ }
+
+ /**
+ * Queue a packet to be sent to player.
+ *
+ * @param packet the bedrock packet from the NukkitX protocol lib
+ */
+ public void sendUpstreamPacket(BedrockPacket packet) {
+ upstream.sendPacket(packet);
+ }
+
+ /**
+ * Send a packet immediately to the player.
+ *
+ * @param packet the bedrock packet from the NukkitX protocol lib
+ */
+ public void sendUpstreamPacketImmediately(BedrockPacket packet) {
+ upstream.sendPacketImmediately(packet);
+ }
+
+ /**
+ * Send a packet to the remote server.
+ *
+ * @param packet the java edition packet from MCProtocolLib
+ */
+ public void sendDownstreamPacket(Packet packet) {
+ if (!closed && this.downstream != null) {
+ Channel channel = this.downstream.getChannel();
+ if (channel == null) {
+ // Channel is only null before the connection has initialized
+ geyser.getLogger().warning("Tried to send a packet to the Java server too early!");
+ if (geyser.getConfig().isDebugMode()) {
+ Thread.dumpStack();
+ }
+ return;
+ }
+
+ EventLoop eventLoop = channel.eventLoop();
+ if (eventLoop.inEventLoop()) {
+ sendDownstreamPacket0(packet);
+ } else {
+ eventLoop.execute(() -> sendDownstreamPacket0(packet));
+ }
+ }
+ }
+
+ private void sendDownstreamPacket0(Packet packet) {
+ if (protocol.getState().equals(ProtocolState.GAME) || packet.getClass() == ServerboundCustomQueryPacket.class) {
+ downstream.send(packet);
+ } else {
+ geyser.getLogger().debug("Tried to send downstream packet " + packet.getClass().getSimpleName() + " before connected to the server");
+ }
+ }
+
+ /**
+ * Update the cached value for the reduced debug info gamerule.
+ * If enabled, also hides the player's coordinates.
+ *
+ * @param value The new value for reducedDebugInfo
+ */
+ public void setReducedDebugInfo(boolean value) {
+ reducedDebugInfo = value;
+ // Set the showCoordinates data. This is done because updateShowCoordinates() uses this gamerule as a variable.
+ preferencesCache.updateShowCoordinates();
+ }
+
+ /**
+ * Changes the daylight cycle gamerule on the client
+ * This is used in the login screen along-side normal usage
+ *
+ * @param doCycle If the cycle should continue
+ */
+ public void setDaylightCycle(boolean doCycle) {
+ sendGameRule("dodaylightcycle", doCycle);
+ // Save the value so we don't have to constantly send a daylight cycle gamerule update
+ this.daylightCycle = doCycle;
+ }
+
+ /**
+ * Send a gamerule value to the client
+ *
+ * @param gameRule The gamerule to send
+ * @param value The value of the gamerule
+ */
+ public void sendGameRule(String gameRule, Object value) {
+ GameRulesChangedPacket gameRulesChangedPacket = new GameRulesChangedPacket();
+ gameRulesChangedPacket.getGameRules().add(new GameRuleData<>(gameRule, value));
+ upstream.sendPacket(gameRulesChangedPacket);
+ }
+
+ /**
+ * Checks if the given session's player has a permission
+ *
+ * @param permission The permission node to check
+ * @return true if the player has the requested permission, false if not
+ */
+ @Override
+ public boolean hasPermission(String permission) {
+ return geyser.getWorldManager().hasPermission(this, permission);
+ }
+
+ /**
+ * Send an AdventureSettingsPacket to the client with the latest flags
+ */
+ public void sendAdventureSettings() {
+ AdventureSettingsPacket adventureSettingsPacket = new AdventureSettingsPacket();
+ adventureSettingsPacket.setUniqueEntityId(playerEntity.getGeyserId());
+ // Set command permission if OP permission level is high enough
+ // This allows mobile players access to a GUI for doing commands. The commands there do not change above OPERATOR
+ // and all commands there are accessible with OP permission level 2
+ adventureSettingsPacket.setCommandPermission(opPermissionLevel >= 2 ? CommandPermission.OPERATOR : CommandPermission.NORMAL);
+ // Required to make command blocks destroyable
+ adventureSettingsPacket.setPlayerPermission(opPermissionLevel >= 2 ? PlayerPermission.OPERATOR : PlayerPermission.MEMBER);
+
+ // Update the noClip and worldImmutable values based on the current gamemode
+ boolean spectator = gameMode == GameMode.SPECTATOR;
+ boolean worldImmutable = gameMode == GameMode.ADVENTURE || spectator;
+
+ Set flags = adventureSettingsPacket.getSettings();
+ if (canFly || spectator) {
+ flags.add(AdventureSetting.MAY_FLY);
+ }
+
+ if (flying || spectator) {
+ if (spectator && !flying) {
+ // We're "flying locked" in this gamemode
+ flying = true;
+ ServerboundPlayerAbilitiesPacket abilitiesPacket = new ServerboundPlayerAbilitiesPacket(true);
+ sendDownstreamPacket(abilitiesPacket);
+ }
+ flags.add(AdventureSetting.FLYING);
+ }
+
+ if (worldImmutable) {
+ flags.add(AdventureSetting.WORLD_IMMUTABLE);
+ }
+
+ if (spectator) {
+ flags.add(AdventureSetting.NO_CLIP);
+ }
+
+ flags.add(AdventureSetting.AUTO_JUMP);
+
+ sendUpstreamPacket(adventureSettingsPacket);
+ }
+
+ /**
+ * Used for updating statistic values since we only get changes from the server
+ *
+ * @param statistics Updated statistics values
+ */
+ public void updateStatistics(@NonNull Map statistics) {
+ this.statistics.putAll(statistics);
+ }
+
+ public void refreshEmotes(List emotes) {
+ this.emotes.addAll(emotes);
+ for (GeyserSession player : geyser.getSessionManager().getSessions().values()) {
+ List pieces = new ArrayList<>();
+ for (UUID piece : emotes) {
+ if (!player.getEmotes().contains(piece)) {
+ pieces.add(piece);
+ }
+ player.getEmotes().add(piece);
+ }
+ EmoteListPacket emoteList = new EmoteListPacket();
+ emoteList.setRuntimeEntityId(player.getPlayerEntity().getGeyserId());
+ emoteList.getPieceIds().addAll(pieces);
+ player.sendUpstreamPacket(emoteList);
+ }
+ }
+}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java b/core/src/main/java/org/geysermc/geyser/network/session/UpstreamSession.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java
rename to core/src/main/java/org/geysermc/geyser/network/session/UpstreamSession.java
index 11df3139c..a96b0448f 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/UpstreamSession.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/UpstreamSession.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session;
+package org.geysermc.geyser.network.session;
import com.nukkitx.protocol.bedrock.BedrockPacket;
import com.nukkitx.protocol.bedrock.BedrockServerSession;
diff --git a/core/src/main/java/org/geysermc/geyser/network/session/auth/AuthData.java b/core/src/main/java/org/geysermc/geyser/network/session/auth/AuthData.java
new file mode 100644
index 000000000..76ea66f55
--- /dev/null
+++ b/core/src/main/java/org/geysermc/geyser/network/session/auth/AuthData.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.network.session.auth;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.geysermc.geyser.GeyserImpl;
+
+import java.util.UUID;
+
+@RequiredArgsConstructor
+public class AuthData {
+ @Getter private final String name;
+ @Getter private final UUID uuid;
+ @Getter private final String xuid;
+
+ private final JsonNode certChainData;
+ private final String clientData;
+
+ public void upload(GeyserImpl geyser) {
+ // we can't upload the skin in LoginEncryptionUtil since the global server would return
+ // the skin too fast, that's why we upload it after we know for sure that the target server
+ // is ready to handle the result of the global server
+ geyser.getSkinUploader().uploadSkin(certChainData, clientData);
+ }
+}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java b/core/src/main/java/org/geysermc/geyser/network/session/auth/BedrockClientData.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
rename to core/src/main/java/org/geysermc/geyser/network/session/auth/BedrockClientData.java
index fc4d1164a..f463e247c 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/auth/BedrockClientData.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.auth;
+package org.geysermc.geyser.network.session.auth;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/AdvancementsCache.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/AdvancementsCache.java
index e53c2cd04..f8b9ca808 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/AdvancementsCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/AdvancementsCache.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.mc.protocol.data.game.advancement.Advancement;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSeenAdvancementsPacket;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.utils.GeyserAdvancement;
-import org.geysermc.connector.utils.LanguageUtils;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.utils.GeyserAdvancement;
+import org.geysermc.geyser.utils.LanguageUtils;
+import org.geysermc.geyser.utils.LocaleUtils;
import org.geysermc.cumulus.SimpleForm;
import org.geysermc.cumulus.response.SimpleFormResponse;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/BookEditCache.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/BookEditCache.java
index 69b56104c..74708b442 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/BookEditCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/BookEditCache.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundEditBookPacket;
import lombok.Setter;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.network.session.GeyserSession;
/**
* Manages updating the current writable book.
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/BossBar.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/BossBar.java
index 28ac9459e..4443275e9 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/BossBar.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/BossBar.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
@@ -32,8 +32,8 @@ import com.nukkitx.protocol.bedrock.packet.BossEventPacket;
import com.nukkitx.protocol.bedrock.packet.RemoveEntityPacket;
import lombok.AllArgsConstructor;
import net.kyori.adventure.text.Component;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@AllArgsConstructor
public class BossBar {
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/ChunkCache.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/ChunkCache.java
index 4de049d1d..197139eba 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/ChunkCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/ChunkCache.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.world.chunk.GeyserChunk;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.chunk.GeyserChunk;
+import org.geysermc.geyser.utils.MathUtils;
public class ChunkCache {
private final boolean cache;
@@ -52,7 +52,7 @@ public class ChunkCache {
private boolean isExtendedHeight = false;
public ChunkCache(GeyserSession session) {
- this.cache = !session.getConnector().getWorldManager().hasOwnChunkCache(); // To prevent Spigot from initializing
+ this.cache = !session.getGeyser().getWorldManager().hasOwnChunkCache(); // To prevent Spigot from initializing
chunks = cache ? new Long2ObjectOpenHashMap<>() : null;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityCache.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/EntityCache.java
index 10b7159aa..cd34bb50d 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityCache.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import it.unimi.dsi.fastutil.longs.Long2LongMap;
import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
@@ -32,10 +32,10 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import lombok.Getter;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.Tickable;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.Tickable;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityEffectCache.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/EntityEffectCache.java
index 910367889..12f99a384 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/EntityEffectCache.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.mc.protocol.data.game.entity.Effect;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/FormCache.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/FormCache.java
index 73475673c..020da79e9 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/FormCache.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.nukkitx.protocol.bedrock.packet.ModalFormRequestPacket;
import com.nukkitx.protocol.bedrock.packet.ModalFormResponsePacket;
@@ -31,8 +31,8 @@ import com.nukkitx.protocol.bedrock.packet.NetworkStackLatencyPacket;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.RequiredArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.cumulus.Form;
import org.geysermc.cumulus.SimpleForm;
@@ -83,7 +83,7 @@ public class FormCache {
try {
responseConsumer.accept(response.getFormData());
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error("Error while processing form response!", e);
+ GeyserImpl.getInstance().getLogger().error("Error while processing form response!", e);
}
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/LodestoneCache.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/LodestoneCache.java
index 5ad07bcd2..adcfdbaa2 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/LodestoneCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/LodestoneCache.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
@@ -33,7 +33,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
-import org.geysermc.connector.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.GeyserItemStack;
import javax.annotation.Nullable;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/PistonCache.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/PistonCache.java
index 14efca357..67f4c490d 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/PistonCache.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.nukkitx.math.vector.Vector3d;
import com.nukkitx.math.vector.Vector3f;
@@ -33,11 +33,11 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.entity.player.SessionPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.world.block.entity.PistonBlockEntity;
-import org.geysermc.connector.utils.Axis;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.world.block.entity.PistonBlockEntity;
+import org.geysermc.geyser.utils.Axis;
import java.util.Map;
@@ -100,9 +100,9 @@ public class PistonCache {
pistons.entrySet().removeIf((entry) -> entry.getValue().canBeRemoved());
if (pistons.isEmpty() && !movingBlocksMap.isEmpty()) {
- session.getConnector().getLogger().error("The moving block map has de-synced!");
+ session.getGeyser().getLogger().error("The moving block map has de-synced!");
for (Map.Entry entry : movingBlocksMap.entrySet()) {
- session.getConnector().getLogger().error("Moving Block at " + entry.getKey() + " was previously owned by the piston at " + entry.getValue().getPosition());
+ session.getGeyser().getLogger().error("Moving Block at " + entry.getKey() + " was previously owned by the piston at " + entry.getValue().getPosition());
}
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/PreferencesCache.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/PreferencesCache.java
index 310ef7911..b71ca17ff 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/PreferencesCache.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.CooldownUtils;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.CooldownUtils;
@Getter
public class PreferencesCache {
@@ -62,7 +62,7 @@ public class PreferencesCache {
public PreferencesCache(GeyserSession session) {
this.session = session;
- prefersCustomSkulls = session.getConnector().getConfig().isAllowCustomSkulls();
+ prefersCustomSkulls = session.getGeyser().getConfig().isAllowCustomSkulls();
}
/**
@@ -74,7 +74,7 @@ public class PreferencesCache {
* {@link GeyserConfiguration#isShowCoordinates()} is disabled
*/
public void updateShowCoordinates() {
- allowShowCoordinates = !session.isReducedDebugInfo() && session.getConnector().getConfig().isShowCoordinates();
+ allowShowCoordinates = !session.isReducedDebugInfo() && session.getGeyser().getConfig().isShowCoordinates();
session.sendGameRule("showcoordinates", allowShowCoordinates && prefersShowCoordinates);
}
@@ -82,6 +82,6 @@ public class PreferencesCache {
* @return true if the session prefers custom skulls, and the config allows them.
*/
public boolean showCustomSkulls() {
- return prefersCustomSkulls && session.getConnector().getConfig().isAllowCustomSkulls();
+ return prefersCustomSkulls && session.getGeyser().getConfig().isAllowCustomSkulls();
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/TagCache.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/TagCache.java
index 221ab36c3..985f1ba2c 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/TagCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/TagCache.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateTagsPacket;
import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.ints.IntLists;
-import org.geysermc.connector.registry.type.BlockMapping;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.BlockMapping;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/TeleportCache.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/TeleportCache.java
index 6f40481db..7ca5b9ed5 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/TeleportCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/TeleportCache.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.nukkitx.math.vector.Vector3d;
import lombok.Data;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldBorder.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/WorldBorder.java
index 9d51f82d2..65dbf3e29 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/WorldBorder.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldBorder.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.nukkitx.math.GenericMath;
import com.nukkitx.math.vector.Vector2d;
@@ -33,9 +33,9 @@ import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
import com.nukkitx.protocol.bedrock.packet.PlayerFogPacket;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
import javax.annotation.Nonnull;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java b/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldCache.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java
rename to core/src/main/java/org/geysermc/geyser/network/session/cache/WorldCache.java
index bec206ba1..a0c4ba9c6 100644
--- a/core/src/main/java/org/geysermc/connector/network/session/cache/WorldCache.java
+++ b/core/src/main/java/org/geysermc/geyser/network/session/cache/WorldCache.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.geyser.network.session.cache;
import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.scoreboard.Scoreboard;
-import org.geysermc.connector.scoreboard.ScoreboardUpdater.ScoreboardSession;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.scoreboard.Scoreboard;
+import org.geysermc.geyser.scoreboard.ScoreboardUpdater.ScoreboardSession;
@Getter
public class WorldCache {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java b/core/src/main/java/org/geysermc/geyser/network/translators/ItemRemapper.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/ItemRemapper.java
index ca0530870..57947d497 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/ItemRemapper.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/ItemRemapper.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators;
+package org.geysermc.geyser.network.translators;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslator.java
index b0b1aab5e..b10d62b33 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/PacketTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslator.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators;
+package org.geysermc.geyser.network.translators;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public abstract class PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java b/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java
similarity index 79%
rename from core/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java
index d86830d20..011360efd 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/PacketTranslatorRegistry.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators;
+package org.geysermc.geyser.network.translators;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTabListPacket;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLightUpdatePacket;
@@ -32,10 +32,10 @@ import com.nukkitx.protocol.bedrock.BedrockPacket;
import io.netty.channel.EventLoop;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.FileUtils;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.IdentityHashMap;
import java.util.Map;
@@ -52,7 +52,7 @@ public class PacketTranslatorRegistry {
for (Class clazz : FileUtils.getGeneratedClassesForAnnotation(Translator.class)) {
Class packet = clazz.getAnnotation(Translator.class).packet();
- GeyserConnector.getInstance().getLogger().debug("Found annotated translator: " + clazz.getCanonicalName() + " : " + packet.getSimpleName());
+ GeyserImpl.getInstance().getLogger().debug("Found annotated translator: " + clazz.getCanonicalName() + " : " + packet.getSimpleName());
try {
if (Packet.class.isAssignableFrom(packet)) {
@@ -66,10 +66,10 @@ public class PacketTranslatorRegistry {
BEDROCK_TRANSLATOR.translators.put(targetPacket, translator);
} else {
- GeyserConnector.getInstance().getLogger().error("Class " + clazz.getCanonicalName() + " is annotated as a translator but has an invalid target packet.");
+ GeyserImpl.getInstance().getLogger().error("Class " + clazz.getCanonicalName() + " is annotated as a translator but has an invalid target packet.");
}
} catch (InstantiationException | IllegalAccessException e) {
- GeyserConnector.getInstance().getLogger().error("Could not instantiate annotated translator " + clazz.getCanonicalName());
+ GeyserImpl.getInstance().getLogger().error("Could not instantiate annotated translator " + clazz.getCanonicalName());
}
}
@@ -97,9 +97,9 @@ public class PacketTranslatorRegistry {
}
return true;
} else {
- if ((GeyserConnector.getInstance().getPlatformType() != PlatformType.STANDALONE || !(packet instanceof BedrockPacket)) && !IGNORED_PACKETS.contains(clazz)) {
+ if ((GeyserImpl.getInstance().getPlatformType() != PlatformType.STANDALONE || !(packet instanceof BedrockPacket)) && !IGNORED_PACKETS.contains(clazz)) {
// Other debug logs already take care of Bedrock packets for us if on standalone
- GeyserConnector.getInstance().getLogger().debug("Could not find packet for " + (packet.toString().length() > 25 ? packet.getClass().getSimpleName() : packet));
+ GeyserImpl.getInstance().getLogger().debug("Could not find packet for " + (packet.toString().length() > 25 ? packet.getClass().getSimpleName() : packet));
}
}
}
@@ -114,7 +114,7 @@ public class PacketTranslatorRegistry {
try {
translator.translate(session, packet);
} catch (Throwable ex) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.network.translator.packet.failed", packet.getClass().getSimpleName()), ex);
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.network.translator.packet.failed", packet.getClass().getSimpleName()), ex);
ex.printStackTrace();
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/Translator.java b/core/src/main/java/org/geysermc/geyser/network/translators/Translator.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/Translator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/Translator.java
index a79543012..ceb254fa2 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/Translator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/Translator.java
@@ -22,7 +22,7 @@
* @author GeyserMC
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators;
+package org.geysermc.geyser.network.translators;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAdventureSettingsTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAdventureSettingsTranslator.java
index 6fafef998..1a3cb4c05 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAdventureSettingsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAdventureSettingsTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerAbilitiesPacket;
import com.nukkitx.protocol.bedrock.data.AdventureSetting;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.AdventureSettingsPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = AdventureSettingsPacket.class)
public class BedrockAdventureSettingsTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAnimateTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAnimateTranslator.java
index 271268ef4..52c4d8a38 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockAnimateTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundPaddleBoatPacket;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket;
import com.nukkitx.protocol.bedrock.packet.AnimatePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockEntityDataTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockEntityDataTranslator.java
index df8ab45f8..65eadc610 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockEntityDataTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockEntityDataTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetJigsawBlockPacket;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundSignUpdatePacket;
import com.nukkitx.nbt.NbtMap;
import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.SignUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.SignUtils;
@Translator(packet = BlockEntityDataPacket.class)
public class BedrockBlockEntityDataTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockPickRequestTranslator.java
similarity index 79%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockPickRequestTranslator.java
index 666c7548b..1d34ec07b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockBlockPickRequestTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockBlockPickRequestTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.packet.BlockPickRequestPacket;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.ItemFrameEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.ItemFrameEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.utils.InventoryUtils;
@Translator(packet = BlockPickRequestPacket.class)
public class BedrockBlockPickRequestTranslator extends PacketTranslator {
@@ -42,7 +42,7 @@ public class BedrockBlockPickRequestTranslator extends PacketTranslator
@Override
public void translate(GeyserSession session, BookEditPacket packet) {
if (packet.getText() != null && !packet.getText().isEmpty() && packet.getText().getBytes(StandardCharsets.UTF_8).length > MAXIMUM_PAGE_LENGTH) {
- session.getConnector().getLogger().warning("Page length greater than server allowed!");
+ session.getGeyser().getLogger().warning("Page length greater than server allowed!");
return;
}
@@ -128,7 +128,7 @@ public class BedrockBookEditTranslator extends PacketTranslator
if (packet.getAction() == BookEditPacket.Action.SIGN_BOOK) {
// Add title to packet so the server knows we're signing
if (packet.getTitle().getBytes(StandardCharsets.UTF_8).length > MAXIMUM_TITLE_LENGTH) {
- session.getConnector().getLogger().warning("Book title larger than server allows!");
+ session.getGeyser().getLogger().warning("Book title larger than server allows!");
return;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java
index 509a7c865..138b69b6e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandBlockUpdateTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.data.game.level.block.CommandBlockMode;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandMinecartPacket;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandBlockPacket;
import com.nukkitx.protocol.bedrock.packet.CommandBlockUpdatePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = CommandBlockUpdatePacket.class)
public class BedrockCommandBlockUpdateTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandRequestTranslator.java
similarity index 74%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandRequestTranslator.java
index 7988436d2..636caf703 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockCommandRequestTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.CommandManager;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.command.CommandManager;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket;
import com.nukkitx.protocol.bedrock.packet.CommandRequestPacket;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = CommandRequestPacket.class)
public class BedrockCommandRequestTranslator extends PacketTranslator {
@@ -42,8 +42,8 @@ public class BedrockCommandRequestTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEmoteListTranslator.java
similarity index 78%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEmoteListTranslator.java
index 4a005082a..54adbab8a 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEmoteListTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEmoteListTranslator.java
@@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.nukkitx.protocol.bedrock.packet.EmoteListPacket;
-import org.geysermc.connector.configuration.EmoteOffhandWorkaroundOption;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = EmoteListPacket.class)
public class BedrockEmoteListTranslator extends PacketTranslator {
@Override
public void translate(GeyserSession session, EmoteListPacket packet) {
- if (session.getConnector().getConfig().getEmoteOffhandWorkaround() == EmoteOffhandWorkaroundOption.NO_EMOTES) {
+ if (session.getGeyser().getConfig().getEmoteOffhandWorkaround() == EmoteOffhandWorkaroundOption.NO_EMOTES) {
return;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEntityPickRequestTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEntityPickRequestTranslator.java
index 669f2751d..ed236d7e7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockEntityPickRequestTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockEntityPickRequestTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.nukkitx.protocol.bedrock.packet.EntityPickRequestPacket;
-import org.geysermc.connector.entity.BoatEntity;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.entity.BoatEntity;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.Locale;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockFilterTextTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockFilterTextTranslator.java
index 23f2ba293..99ebdfa6d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockFilterTextTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockFilterTextTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket;
import com.nukkitx.protocol.bedrock.packet.FilterTextPacket;
-import org.geysermc.connector.inventory.AnvilContainer;
-import org.geysermc.connector.inventory.CartographyContainer;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.utils.ItemUtils;
+import org.geysermc.geyser.inventory.AnvilContainer;
+import org.geysermc.geyser.inventory.CartographyContainer;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.utils.ItemUtils;
/**
* Used to send strings to the server and filter out unwanted words.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
index baa679abc..33c475cb1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
@@ -40,20 +40,20 @@ import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.data.inventory.*;
import com.nukkitx.protocol.bedrock.packet.*;
-import org.geysermc.connector.entity.CommandBlockMinecartEntity;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.ItemFrameEntity;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.sound.EntitySoundInteractionHandler;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.entity.CommandBlockMinecartEntity;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.ItemFrameEntity;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.sound.EntitySoundInteractionHandler;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
+import org.geysermc.geyser.utils.BlockUtils;
import java.util.concurrent.TimeUnit;
@@ -186,7 +186,7 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator {
int blockState = session.getGameMode() == GameMode.CREATIVE ?
- session.getConnector().getWorldManager().getBlockAt(session, packet.getBlockPosition()) : session.getBreakingBlock();
+ session.getGeyser().getWorldManager().getBlockAt(session, packet.getBlockPosition()) : session.getBreakingBlock();
session.setLastBlockPlacedId(null);
session.setLastBlockPlacePosition(null);
@@ -393,7 +393,7 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator 0) {
- if (session.getConnector().getConfig().isForwardPlayerPing()) {
+ if (session.getGeyser().getConfig().isForwardPlayerPing()) {
ServerboundKeepAlivePacket keepAlivePacket = new ServerboundKeepAlivePacket(pingId);
session.sendDownstreamPacket(keepAlivePacket);
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java
similarity index 81%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java
index 110a3f547..1bed7c99f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockPacketViolationWarningTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.nukkitx.protocol.bedrock.packet.PacketViolationWarningPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = PacketViolationWarningPacket.class)
public class BedrockPacketViolationWarningTranslator extends PacketTranslator {
@@ -36,6 +36,6 @@ public class BedrockPacketViolationWarningTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockRespawnTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockRespawnTranslator.java
index 4ccf77370..8cefa57d3 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockRespawnTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.data.game.ClientCommand;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket;
import com.nukkitx.protocol.bedrock.packet.RespawnPacket;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = RespawnPacket.class)
public class BedrockRespawnTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
index 5fe778513..b19626a6b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.nukkitx.protocol.bedrock.packet.ServerSettingsRequestPacket;
import com.nukkitx.protocol.bedrock.packet.ServerSettingsResponsePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.SettingsUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.SettingsUtils;
import org.geysermc.cumulus.CustomForm;
import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java
index 5288a62fa..8f3d734d7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.nukkitx.protocol.bedrock.packet.SetLocalPlayerAsInitializedPacket;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.LoginEncryptionUtils;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.LoginEncryptionUtils;
@Translator(packet = SetLocalPlayerAsInitializedPacket.class)
public class BedrockSetLocalPlayerAsInitializedTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockShowCreditsTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockShowCreditsTranslator.java
index ffdfe4f35..95de61b54 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockShowCreditsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockShowCreditsTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import com.github.steveice10.mc.protocol.data.game.ClientCommand;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockTextTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockTextTranslator.java
index b2fb1fbb5..8b4fc9dde 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockTextTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/BedrockTextTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock;
+package org.geysermc.geyser.network.translators.bedrock;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket;
import com.nukkitx.protocol.bedrock.packet.TextPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = TextPacket.class)
public class BedrockTextTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/BedrockEntityEventTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/BedrockEntityEventTranslator.java
index ef275ca0a..21d7f087c 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/BedrockEntityEventTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/BedrockEntityEventTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock.entity;
+package org.geysermc.geyser.network.translators.bedrock.entity;
import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSelectTradePacket;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
-import org.geysermc.connector.entity.player.SessionPlayerEntity;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.MerchantContainer;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.MerchantContainer;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.concurrent.TimeUnit;
@@ -70,6 +70,6 @@ public class BedrockEntityEventTranslator extends PacketTranslator {
@Override
public void translate(GeyserSession session, EmotePacket packet) {
- if (session.getConnector().getConfig().getEmoteOffhandWorkaround() != EmoteOffhandWorkaroundOption.DISABLED) {
+ if (session.getGeyser().getConfig().getEmoteOffhandWorkaround() != EmoteOffhandWorkaroundOption.DISABLED) {
// Activate the workaround - we should trigger the offhand now
ServerboundPlayerActionPacket swapHandsPacket = new ServerboundPlayerActionPacket(PlayerAction.SWAP_HANDS, BlockUtils.POSITION_ZERO,
Direction.DOWN);
session.sendDownstreamPacket(swapHandsPacket);
- if (session.getConnector().getConfig().getEmoteOffhandWorkaround() == EmoteOffhandWorkaroundOption.NO_EMOTES) {
+ if (session.getGeyser().getConfig().getEmoteOffhandWorkaround() == EmoteOffhandWorkaroundOption.NO_EMOTES) {
return;
}
}
long javaId = session.getPlayerEntity().getEntityId();
- for (GeyserSession otherSession : session.getConnector().getSessionManager().getSessions().values()) {
+ for (GeyserSession otherSession : session.getGeyser().getSessionManager().getSessions().values()) {
if (otherSession != session) {
if (otherSession.isClosed()) continue;
if (otherSession.getEventLoop().inEventLoop()) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
index 2ee2fbb7c..5273c1c97 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock.entity.player;
+package org.geysermc.geyser.network.translators.bedrock.entity.player;
import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction;
@@ -35,12 +35,12 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
import com.nukkitx.protocol.bedrock.packet.InteractPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.InteractiveTagManager;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.InteractiveTagManager;
@Translator(packet = InteractPacket.class)
public class BedrockInteractTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
index 609ee6f2d..190b9a2ef 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock.entity.player;
+package org.geysermc.geyser.network.translators.bedrock.entity.player;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
@@ -33,12 +33,12 @@ import com.nukkitx.math.vector.Vector3d;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket;
import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.player.SessionPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = MovePlayerPacket.class)
public class BedrockMovePlayerTranslator extends PacketTranslator {
@@ -145,7 +145,7 @@ public class BedrockMovePlayerTranslator extends PacketTranslator 300) {
- session.getConnector().getLogger().debug(ChatColor.RED + session.getName() + " moved too quickly." +
+ session.getGeyser().getLogger().debug(ChatColor.RED + session.getName() + " moved too quickly." +
" current position: " + currentPosition + ", new position: " + newPosition);
return false;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java
index 3c562dbc9..d52c2fc81 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockRiderJumpTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock.entity.player;
+package org.geysermc.geyser.network.translators.bedrock.entity.player;
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerState;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket;
import com.nukkitx.protocol.bedrock.packet.RiderJumpPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = RiderJumpPacket.class)
public class BedrockRiderJumpTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java
index 1022d838d..80d5f9840 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock.entity.player;
+package org.geysermc.geyser.network.translators.bedrock.entity.player;
import com.nukkitx.protocol.bedrock.packet.SetPlayerGameTypePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
/**
* In vanilla Bedrock, if you have operator status, this sets the player's gamemode without confirmation from the server.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java
index 8b19a00eb..1b1532ffa 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/bedrock/world/BedrockLevelSoundEventTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.bedrock.world;
+package org.geysermc.geyser.network.translators.bedrock.world;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.CooldownUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.CooldownUtils;
@Translator(packet = LevelSoundEventPacket.class)
public class BedrockLevelSoundEventTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java b/core/src/main/java/org/geysermc/geyser/network/translators/chat/GsonComponentSerializerWrapper.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/chat/GsonComponentSerializerWrapper.java
index c5888c06a..102780856 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/chat/GsonComponentSerializerWrapper.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/chat/GsonComponentSerializerWrapper.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.chat;
+package org.geysermc.geyser.network.translators.chat;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/chat/MessageTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/chat/MessageTranslator.java
index 55087de0f..4b03d4b20 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/chat/MessageTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/chat/MessageTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.chat;
+package org.geysermc.geyser.network.translators.chat;
import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor;
@@ -32,9 +32,9 @@ import net.kyori.adventure.text.renderer.TranslatableComponentRenderer;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.EnumMap;
import java.util.Map;
@@ -119,8 +119,8 @@ public class MessageTranslator {
return legacy;
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().debug(GSON_SERIALIZER.serialize(message));
- GeyserConnector.getInstance().getLogger().error("Failed to parse message", e);
+ GeyserImpl.getInstance().getLogger().debug(GSON_SERIALIZER.serialize(message));
+ GeyserImpl.getInstance().getLogger().error("Failed to parse message", e);
return "";
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java b/core/src/main/java/org/geysermc/geyser/network/translators/chat/MinecraftTranslationRegistry.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/chat/MinecraftTranslationRegistry.java
index 3bae14abf..a8a90c1a5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/chat/MinecraftTranslationRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/chat/MinecraftTranslationRegistry.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.chat;
+package org.geysermc.geyser.network.translators.chat;
import net.kyori.adventure.text.renderer.TranslatableComponentRenderer;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.utils.LocaleUtils;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/BoundingBox.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/BoundingBox.java
index e74953b7a..c79c2799f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/BoundingBox.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/BoundingBox.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision;
+package org.geysermc.geyser.network.translators.collision;
import com.nukkitx.math.vector.Vector3d;
import lombok.*;
-import org.geysermc.connector.utils.Axis;
-import org.geysermc.connector.utils.Direction;
+import org.geysermc.geyser.utils.Axis;
+import org.geysermc.geyser.utils.Direction;
@Data
@AllArgsConstructor
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionManager.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionManager.java
index 3d9069232..74678ae1d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionManager.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision;
+package org.geysermc.geyser.network.translators.collision;
import com.nukkitx.math.vector.Vector3d;
import com.nukkitx.math.vector.Vector3f;
@@ -32,17 +32,17 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket;
import lombok.Getter;
import lombok.Setter;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.PistonCache;
-import org.geysermc.connector.network.translators.collision.translators.BlockCollision;
-import org.geysermc.connector.network.translators.collision.translators.ScaffoldingCollision;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.utils.Axis;
-import org.geysermc.connector.utils.BlockPositionIterator;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.PistonCache;
+import org.geysermc.geyser.network.translators.collision.translators.BlockCollision;
+import org.geysermc.geyser.network.translators.collision.translators.ScaffoldingCollision;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.utils.Axis;
+import org.geysermc.geyser.utils.BlockPositionIterator;
+import org.geysermc.geyser.utils.BlockUtils;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
@@ -388,7 +388,7 @@ public class CollisionManager {
* @return if the player is currently in a water block
*/
public boolean isPlayerInWater() {
- return session.getConnector().getWorldManager().getBlockAt(session, session.getPlayerEntity().getPosition().toInt()) == BlockStateValues.JAVA_WATER_ID;
+ return session.getGeyser().getWorldManager().getBlockAt(session, session.getPlayerEntity().getPosition().toInt()) == BlockStateValues.JAVA_WATER_ID;
}
/**
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionRemapper.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionRemapper.java
index e582d0959..c932b1f68 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/CollisionRemapper.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/CollisionRemapper.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision;
+package org.geysermc.geyser.network.translators.collision;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/BlockCollision.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/BlockCollision.java
index 869ff97d3..cc84824cd 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/BlockCollision.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import com.nukkitx.math.vector.Vector3d;
import com.nukkitx.math.vector.Vector3i;
import lombok.EqualsAndHashCode;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionManager;
-import org.geysermc.connector.utils.Axis;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionManager;
+import org.geysermc.geyser.utils.Axis;
@EqualsAndHashCode
public class BlockCollision {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DirtPathCollision.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DirtPathCollision.java
index e4d1b8f5a..06df05054 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DirtPathCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DirtPathCollision.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionManager;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionManager;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
@EqualsAndHashCode(callSuper = true)
@CollisionRemapper(regex = "^dirt_path$", passDefaultBoxes = true)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DoorCollision.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DoorCollision.java
index d1b8e45aa..6c165bd1f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/DoorCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/DoorCollision.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import com.nukkitx.math.vector.Vector3i;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
@EqualsAndHashCode(callSuper = true)
@CollisionRemapper(regex = "_door$", usesParams = true, passDefaultBoxes = true)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/OtherCollision.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/OtherCollision.java
index 8a49a28af..eeb89b65f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/OtherCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/OtherCollision.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
@EqualsAndHashCode(callSuper = true)
public class OtherCollision extends BlockCollision {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/ScaffoldingCollision.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/ScaffoldingCollision.java
index 9aed59636..be5e3c028 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/ScaffoldingCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/ScaffoldingCollision.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
/**
* In order for scaffolding to work on Bedrock, entity flags need to be sent to the player
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SnowCollision.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SnowCollision.java
index 35ac13056..dc8b095b0 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SnowCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SnowCollision.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
@EqualsAndHashCode(callSuper = true)
@CollisionRemapper(regex = "^snow$", passDefaultBoxes = true, usesParams = true)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SolidCollision.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SolidCollision.java
index d96e7d588..c772ff75f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SolidCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SolidCollision.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
@EqualsAndHashCode(callSuper = true)
@CollisionRemapper(regex = "shulker_box$") // These have no collision in the mappings as it depends on the NBT data
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SpawnerCollision.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SpawnerCollision.java
index 867d4b412..cef39dba1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/SpawnerCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/SpawnerCollision.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
@EqualsAndHashCode(callSuper = true)
@CollisionRemapper(regex = "^spawner$")
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/TrapdoorCollision.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/TrapdoorCollision.java
index aef966edf..948622640 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/collision/translators/TrapdoorCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/collision/translators/TrapdoorCollision.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.collision.translators;
+package org.geysermc.geyser.network.translators.collision.translators;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionManager;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionManager;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
@EqualsAndHashCode(callSuper = true)
@CollisionRemapper(regex = "_trapdoor$", usesParams = true, passDefaultBoxes = true)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/BedrockContainerSlot.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/BedrockContainerSlot.java
index 47d1f0709..07ca32d61 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/BedrockContainerSlot.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/BedrockContainerSlot.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory;
+package org.geysermc.geyser.network.translators.inventory;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import lombok.Value;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/InventoryTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/InventoryTranslator.java
index 2ebf823ac..1c11da986 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/InventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory;
+package org.geysermc.geyser.network.translators.inventory;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
@@ -41,22 +41,22 @@ import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.*;
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
import it.unimi.dsi.fastutil.ints.*;
import lombok.AllArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.inventory.CartographyContainer;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.click.Click;
-import org.geysermc.connector.network.translators.inventory.click.ClickPlan;
-import org.geysermc.connector.network.translators.inventory.translators.*;
-import org.geysermc.connector.network.translators.inventory.translators.chest.DoubleChestInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.chest.SingleChestInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.furnace.BlastFurnaceInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.furnace.FurnaceInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.furnace.SmokerInventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
-import org.geysermc.connector.utils.ItemUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.inventory.CartographyContainer;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.click.Click;
+import org.geysermc.geyser.network.translators.inventory.click.ClickPlan;
+import org.geysermc.geyser.network.translators.inventory.translators.*;
+import org.geysermc.geyser.network.translators.inventory.translators.chest.DoubleChestInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.chest.SingleChestInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.furnace.BlastFurnaceInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.furnace.FurnaceInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.furnace.SmokerInventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
+import org.geysermc.geyser.utils.ItemUtils;
import java.util.*;
@@ -201,8 +201,8 @@ public abstract class InventoryTranslator {
transferAction.getSource().getSlot() >= 28 && transferAction.getSource().getSlot() <= 31) {
return rejectRequest(request, false);
}
- if (session.getConnector().getConfig().isDebugMode()) {
- session.getConnector().getLogger().error("DEBUG: About to reject TAKE/PLACE request made by " + session.getName());
+ if (session.getGeyser().getConfig().isDebugMode()) {
+ session.getGeyser().getLogger().error("DEBUG: About to reject TAKE/PLACE request made by " + session.getName());
dumpStackRequestDetails(session, inventory, transferAction.getSource(), transferAction.getDestination());
}
return rejectRequest(request);
@@ -287,8 +287,8 @@ public abstract class InventoryTranslator {
case SWAP: {
SwapStackRequestActionData swapAction = (SwapStackRequestActionData) action;
if (!(checkNetId(session, inventory, swapAction.getSource()) && checkNetId(session, inventory, swapAction.getDestination()))) {
- if (session.getConnector().getConfig().isDebugMode()) {
- session.getConnector().getLogger().error("DEBUG: About to reject SWAP request made by " + session.getName());
+ if (session.getGeyser().getConfig().isDebugMode()) {
+ session.getGeyser().getLogger().error("DEBUG: About to reject SWAP request made by " + session.getName());
dumpStackRequestDetails(session, inventory, swapAction.getSource(), swapAction.getDestination());
}
return rejectRequest(request);
@@ -760,7 +760,7 @@ public abstract class InventoryTranslator {
* as bad (false).
*/
public static ItemStackResponsePacket.Response rejectRequest(ItemStackRequest request, boolean throwError) {
- if (throwError && GeyserConnector.getInstance().getConfig().isDebugMode()) {
+ if (throwError && GeyserImpl.getInstance().getConfig().isDebugMode()) {
new Throwable("DEBUGGING: ItemStackRequest rejected " + request.toString()).printStackTrace();
}
return new ItemStackResponsePacket.Response(ItemStackResponsePacket.ResponseStatus.ERROR, request.getRequestId(), Collections.emptyList());
@@ -770,10 +770,10 @@ public abstract class InventoryTranslator {
* Print out the contents of an ItemStackRequest, should the net ID check fail.
*/
protected void dumpStackRequestDetails(GeyserSession session, Inventory inventory, StackRequestSlotInfoData source, StackRequestSlotInfoData destination) {
- session.getConnector().getLogger().error("Source: " + source.toString() + " Result: " + checkNetId(session, inventory, source));
- session.getConnector().getLogger().error("Destination: " + destination.toString() + " Result: " + checkNetId(session, inventory, destination));
- session.getConnector().getLogger().error("Geyser's record of source slot: " + inventory.getItem(bedrockSlotToJava(source)));
- session.getConnector().getLogger().error("Geyser's record of destination slot: " + inventory.getItem(bedrockSlotToJava(destination)));
+ session.getGeyser().getLogger().error("Source: " + source.toString() + " Result: " + checkNetId(session, inventory, source));
+ session.getGeyser().getLogger().error("Destination: " + destination.toString() + " Result: " + checkNetId(session, inventory, destination));
+ session.getGeyser().getLogger().error("Geyser's record of source slot: " + inventory.getItem(bedrockSlotToJava(source)));
+ session.getGeyser().getLogger().error("Geyser's record of destination slot: " + inventory.getItem(bedrockSlotToJava(destination)));
}
public boolean checkNetId(GeyserSession session, Inventory inventory, StackRequestSlotInfoData slotInfoData) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/SlotType.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/SlotType.java
index d4df48a59..38cca8397 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/SlotType.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory;
+package org.geysermc.geyser.network.translators.inventory;
public enum SlotType {
NORMAL,
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/Click.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/Click.java
index 4c0ea7709..b194c9acf 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/click/Click.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/Click.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.click;
+package org.geysermc.geyser.network.translators.inventory.click;
import com.github.steveice10.mc.protocol.data.game.inventory.ClickItemAction;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerActionType;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/ClickPlan.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/ClickPlan.java
index d6063b98d..23a3a314d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/click/ClickPlan.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/click/ClickPlan.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.click;
+package org.geysermc.geyser.network.translators.inventory.click;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerActionType;
@@ -33,14 +33,14 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
import lombok.Value;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.inventory.translators.CraftingInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.PlayerInventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.inventory.translators.CraftingInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.PlayerInventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/BlockInventoryHolder.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/BlockInventoryHolder.java
index 8a1467b0e..63b1747cf 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/BlockInventoryHolder.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.holder;
+package org.geysermc.geyser.network.translators.inventory.holder;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.google.common.collect.ImmutableSet;
@@ -34,12 +34,12 @@ import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket;
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
-import org.geysermc.connector.inventory.Container;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.inventory.Container;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.utils.BlockUtils;
import java.util.Collections;
import java.util.HashSet;
@@ -77,7 +77,7 @@ public class BlockInventoryHolder extends InventoryHolder {
// (This could be a virtual inventory that the player is opening)
if (checkInteractionPosition(session)) {
// Then, check to see if the interacted block is valid for this inventory by ensuring the block state identifier is valid
- int javaBlockId = session.getConnector().getWorldManager().getBlockAt(session, session.getLastInteractionBlockPosition());
+ int javaBlockId = session.getGeyser().getWorldManager().getBlockAt(session, session.getLastInteractionBlockPosition());
String[] javaBlockString = BlockRegistries.JAVA_IDENTIFIERS.get().getOrDefault(javaBlockId, "minecraft:air").split("\\[");
if (isValidBlock(javaBlockString)) {
// We can safely use this block
@@ -155,7 +155,7 @@ public class BlockInventoryHolder extends InventoryHolder {
Vector3i holderPos = inventory.getHolderPosition();
Position pos = new Position(holderPos.getX(), holderPos.getY(), holderPos.getZ());
- int realBlock = session.getConnector().getWorldManager().getBlockAt(session, pos.getX(), pos.getY(), pos.getZ());
+ int realBlock = session.getGeyser().getWorldManager().getBlockAt(session, pos.getX(), pos.getY(), pos.getZ());
UpdateBlockPacket blockPacket = new UpdateBlockPacket();
blockPacket.setDataLayer(0);
blockPacket.setBlockPosition(holderPos);
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/InventoryHolder.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/InventoryHolder.java
index 8b5c5473f..810bab350 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/holder/InventoryHolder.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/holder/InventoryHolder.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.holder;
+package org.geysermc.geyser.network.translators.inventory.holder;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
public abstract class InventoryHolder {
public abstract void prepareInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory);
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java
index 49caef13b..a0b5298a7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AbstractBlockInventoryTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.holder.BlockInventoryHolder;
-import org.geysermc.connector.network.translators.inventory.holder.InventoryHolder;
-import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder;
+import org.geysermc.geyser.network.translators.inventory.holder.InventoryHolder;
+import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater;
/**
* Provided as a base for any inventory that requires a block for opening it
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AnvilInventoryTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AnvilInventoryTranslator.java
index 3fa9ebdd7..ce40f0a44 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/AnvilInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/AnvilInventoryTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.inventory.AnvilContainer;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.AnvilInventoryUpdater;
+import org.geysermc.geyser.inventory.AnvilContainer;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.AnvilInventoryUpdater;
public class AnvilInventoryTranslator extends AbstractBlockInventoryTranslator {
public AnvilInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BaseInventoryTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BaseInventoryTranslator.java
index 4211e9902..fb3f2cac4 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BaseInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BaseInventoryTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.inventory.Container;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.SlotType;
+import org.geysermc.geyser.inventory.Container;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
public abstract class BaseInventoryTranslator extends InventoryTranslator {
public BaseInventoryTranslator(int size) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BeaconInventoryTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BeaconInventoryTranslator.java
index 2fb26847a..6a5ae2cc5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BeaconInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BeaconInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetBeaconPacket;
@@ -38,15 +38,15 @@ import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequ
import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequestActionType;
import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
-import org.geysermc.connector.inventory.BeaconContainer;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.holder.BlockInventoryHolder;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.inventory.BeaconContainer;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BrewingInventoryTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BrewingInventoryTranslator.java
index 17baff323..a38fbe126 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/BrewingInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/BrewingInventoryTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
import com.nukkitx.protocol.bedrock.packet.ContainerSetDataPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater;
public class BrewingInventoryTranslator extends AbstractBlockInventoryTranslator {
public BrewingInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CartographyInventoryTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CartographyInventoryTranslator.java
index 3d9520a0a..3e16635ed 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CartographyInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CartographyInventoryTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.inventory.CartographyContainer;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.inventory.CartographyContainer;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
public class CartographyInventoryTranslator extends AbstractBlockInventoryTranslator {
public CartographyInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CraftingInventoryTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CraftingInventoryTranslator.java
index 363c9b702..6baf2b9ca 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/CraftingInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/CraftingInventoryTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
public class CraftingInventoryTranslator extends AbstractBlockInventoryTranslator {
public CraftingInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/EnchantingInventoryTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/EnchantingInventoryTranslator.java
index 18254dee5..f0bf1a993 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/EnchantingInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/EnchantingInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket;
@@ -33,14 +33,14 @@ import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequ
import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequestActionType;
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
import com.nukkitx.protocol.bedrock.packet.PlayerEnchantOptionsPacket;
-import org.geysermc.connector.inventory.EnchantingContainer;
-import org.geysermc.connector.inventory.GeyserEnchantOption;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
-import org.geysermc.connector.network.translators.item.Enchantment;
+import org.geysermc.geyser.inventory.EnchantingContainer;
+import org.geysermc.geyser.inventory.GeyserEnchantOption;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.network.translators.item.Enchantment;
import java.util.Arrays;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/Generic3X3InventoryTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/Generic3X3InventoryTranslator.java
index a77716c91..eaef37335 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/Generic3X3InventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/Generic3X3InventoryTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
-import org.geysermc.connector.inventory.Generic3X3Container;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+import org.geysermc.geyser.inventory.Generic3X3Container;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater;
/**
* Droppers and dispensers
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/GrindstoneInventoryTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/GrindstoneInventoryTranslator.java
index a71594153..501c4be58 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/GrindstoneInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/GrindstoneInventoryTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
public class GrindstoneInventoryTranslator extends AbstractBlockInventoryTranslator {
public GrindstoneInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/HopperInventoryTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/HopperInventoryTranslator.java
index 7f067d1c0..44fff7406 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/HopperInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/HopperInventoryTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater;
/**
* Implemented on top of any block that does not have special properties implemented
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LecternInventoryTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LecternInventoryTranslator.java
index cc94ffff3..7b0f4a5f0 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LecternInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LecternInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket;
@@ -35,14 +35,14 @@ import com.nukkitx.nbt.NbtMap;
import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.nbt.NbtType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.LecternContainer;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
-import org.geysermc.connector.utils.BlockEntityUtils;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.LecternContainer;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater;
+import org.geysermc.geyser.utils.BlockEntityUtils;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.Collections;
@@ -109,7 +109,7 @@ public class LecternInventoryTranslator extends BaseInventoryTranslator {
Vector3i position = session.getLastInteractionBlockPosition();
// If shouldExpectLecternHandled returns true, this is already handled for us
// shouldRefresh means that we should boot out the client on our side because their lectern GUI isn't updated yet
- boolean shouldRefresh = !session.getConnector().getWorldManager().shouldExpectLecternHandled() && !session.getLecternCache().contains(position);
+ boolean shouldRefresh = !session.getGeyser().getWorldManager().shouldExpectLecternHandled() && !session.getLecternCache().contains(position);
NbtMap blockEntityTag;
if (tag != null) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LoomInventoryTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LoomInventoryTranslator.java
index bc2991f7f..bdf5de762 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/LoomInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/LoomInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -41,13 +41,13 @@ import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequ
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
-import org.geysermc.connector.network.translators.item.translators.BannerTranslator;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.network.translators.item.translators.BannerTranslator;
import java.util.Collections;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/MerchantInventoryTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/MerchantInventoryTranslator.java
index be3b09b50..130e7cca9 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/MerchantInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/MerchantInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
import com.nukkitx.math.vector.Vector3f;
@@ -34,16 +34,16 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemStackRequest;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
import com.nukkitx.protocol.bedrock.packet.SetEntityLinkPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.MerchantContainer;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.MerchantContainer;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
public class MerchantInventoryTranslator extends BaseInventoryTranslator {
private final InventoryUpdater updater;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/PlayerInventoryTranslator.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/PlayerInventoryTranslator.java
index fa54b1223..ace0ae665 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/PlayerInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/PlayerInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
@@ -36,16 +36,16 @@ import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.Arrays;
import java.util.Collections;
@@ -354,7 +354,7 @@ public class PlayerInventoryTranslator extends InventoryTranslator {
}
}
default -> {
- session.getConnector().getLogger().error("Unknown crafting state induced by " + session.getName());
+ session.getGeyser().getLogger().error("Unknown crafting state induced by " + session.getName());
return rejectRequest(request);
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/ShulkerInventoryTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/ShulkerInventoryTranslator.java
index 7dafb862a..a924c05b7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/ShulkerInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/ShulkerInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.nukkitx.math.vector.Vector3i;
@@ -32,13 +32,13 @@ import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.holder.BlockInventoryHolder;
-import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
-import org.geysermc.connector.registry.Registries;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder;
+import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator;
+import org.geysermc.geyser.registry.Registries;
public class ShulkerInventoryTranslator extends AbstractBlockInventoryTranslator {
public ShulkerInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/SmithingInventoryTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/SmithingInventoryTranslator.java
index 8b30be406..3b8d05c69 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/SmithingInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/SmithingInventoryTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
public class SmithingInventoryTranslator extends AbstractBlockInventoryTranslator {
public SmithingInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/StonecutterInventoryTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/StonecutterInventoryTranslator.java
index 3c508b851..f2b8ac354 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/StonecutterInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators;
+package org.geysermc.geyser.network.translators.inventory.translators;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
@@ -36,15 +36,15 @@ import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequ
import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequestActionType;
import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
import it.unimi.dsi.fastutil.ints.IntList;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.inventory.StonecutterContainer;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.inventory.updater.UIInventoryUpdater;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.inventory.StonecutterContainer;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.inventory.updater.UIInventoryUpdater;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
public class StonecutterInventoryTranslator extends AbstractBlockInventoryTranslator {
public StonecutterInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/ChestInventoryTranslator.java
similarity index 83%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/ChestInventoryTranslator.java
index d54419b82..6a88d26d4 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/ChestInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/ChestInventoryTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.chest;
+package org.geysermc.geyser.network.translators.inventory.translators.chest;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.translators.BaseInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.updater.ChestInventoryUpdater;
-import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.translators.BaseInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.updater.ChestInventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater;
public abstract class ChestInventoryTranslator extends BaseInventoryTranslator {
private final InventoryUpdater updater;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java
index 029509157..838b11978 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.chest;
+package org.geysermc.geyser.network.translators.inventory.translators.chest;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
@@ -33,13 +33,13 @@ import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket;
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
-import org.geysermc.connector.inventory.Container;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.world.block.DoubleChestValue;
-import org.geysermc.connector.network.translators.world.block.entity.DoubleChestBlockEntityTranslator;
-import org.geysermc.connector.registry.BlockRegistries;
+import org.geysermc.geyser.inventory.Container;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.DoubleChestValue;
+import org.geysermc.geyser.network.translators.world.block.entity.DoubleChestBlockEntityTranslator;
+import org.geysermc.geyser.registry.BlockRegistries;
public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
private final int defaultJavaBlockState;
@@ -53,7 +53,7 @@ public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
public void prepareInventory(GeyserSession session, Inventory inventory) {
// See BlockInventoryHolder - same concept there except we're also dealing with a specific block state
if (session.getLastInteractionPlayerPosition().equals(session.getPlayerEntity().getPosition())) {
- int javaBlockId = session.getConnector().getWorldManager().getBlockAt(session, session.getLastInteractionBlockPosition());
+ int javaBlockId = session.getGeyser().getWorldManager().getBlockAt(session, session.getLastInteractionBlockPosition());
String[] javaBlockString = BlockRegistries.JAVA_IDENTIFIERS.get().getOrDefault(javaBlockId, "minecraft:air").split("\\[");
if (javaBlockString.length > 1 && (javaBlockString[0].equals("minecraft:chest") || javaBlockString[0].equals("minecraft:trapped_chest"))
&& !javaBlockString[1].contains("type=single")) {
@@ -150,7 +150,7 @@ public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
}
Vector3i holderPos = inventory.getHolderPosition();
- int realBlock = session.getConnector().getWorldManager().getBlockAt(session, holderPos);
+ int realBlock = session.getGeyser().getWorldManager().getBlockAt(session, holderPos);
UpdateBlockPacket blockPacket = new UpdateBlockPacket();
blockPacket.setDataLayer(0);
blockPacket.setBlockPosition(holderPos);
@@ -158,7 +158,7 @@ public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
session.sendUpstreamPacket(blockPacket);
holderPos = holderPos.add(Vector3i.UNIT_X);
- realBlock = session.getConnector().getWorldManager().getBlockAt(session, holderPos);
+ realBlock = session.getGeyser().getWorldManager().getBlockAt(session, holderPos);
blockPacket = new UpdateBlockPacket();
blockPacket.setDataLayer(0);
blockPacket.setBlockPosition(holderPos);
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java
index 42b23d5b4..d6348bc7e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.chest;
+package org.geysermc.geyser.network.translators.inventory.translators.chest;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.holder.BlockInventoryHolder;
-import org.geysermc.connector.network.translators.inventory.holder.InventoryHolder;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.holder.BlockInventoryHolder;
+import org.geysermc.geyser.network.translators.inventory.holder.InventoryHolder;
public class SingleChestInventoryTranslator extends ChestInventoryTranslator {
private final InventoryHolder holder;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java
index dc9b00fd7..d2fa100a6 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/AbstractFurnaceInventoryTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.furnace;
+package org.geysermc.geyser.network.translators.inventory.translators.furnace;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.packet.ContainerSetDataPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
-import org.geysermc.connector.network.translators.inventory.SlotType;
-import org.geysermc.connector.network.translators.inventory.translators.AbstractBlockInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.SlotType;
+import org.geysermc.geyser.network.translators.inventory.translators.AbstractBlockInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.updater.ContainerInventoryUpdater;
public abstract class AbstractFurnaceInventoryTranslator extends AbstractBlockInventoryTranslator {
AbstractFurnaceInventoryTranslator(String javaBlockIdentifier, ContainerType containerType) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java
index ed9a8a79c..7d1b14683 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/BlastFurnaceInventoryTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.furnace;
+package org.geysermc.geyser.network.translators.inventory.translators.furnace;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
public class BlastFurnaceInventoryTranslator extends AbstractFurnaceInventoryTranslator {
public BlastFurnaceInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java
index b41c9b03b..e6c563bd5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/FurnaceInventoryTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.furnace;
+package org.geysermc.geyser.network.translators.inventory.translators.furnace;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
public class FurnaceInventoryTranslator extends AbstractFurnaceInventoryTranslator {
public FurnaceInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java
index 2b9a78c7d..68583c8b0 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/furnace/SmokerInventoryTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.furnace;
+package org.geysermc.geyser.network.translators.inventory.translators.furnace;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
public class SmokerInventoryTranslator extends AbstractFurnaceInventoryTranslator {
public SmokerInventoryTranslator() {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java
similarity index 81%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java
index 0e365aca1..d9549e5a8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/AbstractHorseInventoryTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.horse;
+package org.geysermc.geyser.network.translators.inventory.translators.horse;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.translators.BaseInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.updater.HorseInventoryUpdater;
-import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.translators.BaseInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.updater.HorseInventoryUpdater;
+import org.geysermc.geyser.network.translators.inventory.updater.InventoryUpdater;
public abstract class AbstractHorseInventoryTranslator extends BaseInventoryTranslator {
private final InventoryUpdater updater;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java
index 77a1976be..bd7cfb9f9 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/ChestedHorseInventoryTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.horse;
+package org.geysermc.geyser.network.translators.inventory.translators.horse;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java
index bf13bd6da..f73c43973 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/DonkeyInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.horse;
+package org.geysermc.geyser.network.translators.inventory.translators.horse;
public class DonkeyInventoryTranslator extends ChestedHorseInventoryTranslator {
public DonkeyInventoryTranslator(int size) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/HorseInventoryTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/HorseInventoryTranslator.java
index 09a8f5de3..da06a5c18 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/HorseInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/HorseInventoryTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.horse;
+package org.geysermc.geyser.network.translators.inventory.translators.horse;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
-import org.geysermc.connector.network.translators.inventory.BedrockContainerSlot;
+import org.geysermc.geyser.network.translators.inventory.BedrockContainerSlot;
public class HorseInventoryTranslator extends AbstractHorseInventoryTranslator {
public HorseInventoryTranslator(int size) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java
index cea605f83..c7e98d7c1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/translators/horse/LlamaInventoryTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.translators.horse;
+package org.geysermc.geyser.network.translators.inventory.translators.horse;
public class LlamaInventoryTranslator extends ChestedHorseInventoryTranslator {
public LlamaInventoryTranslator(int size) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/AnvilInventoryUpdater.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/AnvilInventoryUpdater.java
index 6dfd60b8b..acb5f0941 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/AnvilInventoryUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/AnvilInventoryUpdater.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.updater;
+package org.geysermc.geyser.network.translators.inventory.updater;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket;
@@ -36,17 +36,17 @@ import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntMaps;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.inventory.AnvilContainer;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.item.Enchantment.JavaEnchantment;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.EnchantmentData;
-import org.geysermc.connector.utils.ItemUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.inventory.AnvilContainer;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.EnchantmentData;
+import org.geysermc.geyser.utils.ItemUtils;
import java.util.Objects;
import java.util.Set;
@@ -312,7 +312,7 @@ public class AnvilInventoryUpdater extends InventoryUpdater {
JavaEnchantment enchantment = entry.getKey();
EnchantmentData data = Registries.ENCHANTMENTS.get(enchantment);
if (data == null) {
- GeyserConnector.getInstance().getLogger().debug("Java enchantment not in registry: " + enchantment);
+ GeyserImpl.getInstance().getLogger().debug("Java enchantment not in registry: " + enchantment);
continue;
}
@@ -384,7 +384,7 @@ public class AnvilInventoryUpdater extends InventoryUpdater {
if (enchantTag.get("id") instanceof StringTag javaEnchId) {
JavaEnchantment enchantment = JavaEnchantment.getByJavaIdentifier(javaEnchId.getValue());
if (enchantment == null) {
- GeyserConnector.getInstance().getLogger().debug("Unknown java enchantment: " + javaEnchId.getValue());
+ GeyserImpl.getInstance().getLogger().debug("Unknown java enchantment: " + javaEnchId.getValue());
continue;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ChestInventoryUpdater.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ChestInventoryUpdater.java
index b421044bf..a3e5bb201 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ChestInventoryUpdater.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.updater;
+package org.geysermc.geyser.network.translators.inventory.updater;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
import lombok.AllArgsConstructor;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ContainerInventoryUpdater.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ContainerInventoryUpdater.java
index f77e687a0..eb0b8afaa 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/ContainerInventoryUpdater.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.updater;
+package org.geysermc.geyser.network.translators.inventory.updater;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/HorseInventoryUpdater.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/HorseInventoryUpdater.java
index db067a74c..115970b9b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/HorseInventoryUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/HorseInventoryUpdater.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.updater;
+package org.geysermc.geyser.network.translators.inventory.updater;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/InventoryUpdater.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/InventoryUpdater.java
index e94c0944b..67ee607b9 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/InventoryUpdater.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.updater;
+package org.geysermc.geyser.network.translators.inventory.updater;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/UIInventoryUpdater.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/UIInventoryUpdater.java
index 5bb8ad5d2..aa24aae1e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/inventory/updater/UIInventoryUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/inventory/updater/UIInventoryUpdater.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.inventory.updater;
+package org.geysermc.geyser.network.translators.inventory.updater;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
public class UIInventoryUpdater extends InventoryUpdater {
public static final UIInventoryUpdater INSTANCE = new UIInventoryUpdater();
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/Enchantment.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/Enchantment.java
index 947f9e6ed..5d05632c3 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/Enchantment.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/Enchantment.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item;
+package org.geysermc.geyser.network.translators.item;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/ItemTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/ItemTranslator.java
index 9fcf984cd..3429dcdd7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/ItemTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item;
+package org.geysermc.geyser.network.translators.item;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.*;
@@ -34,15 +34,15 @@ import com.nukkitx.nbt.NbtType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
+import org.geysermc.geyser.utils.FileUtils;
+import org.geysermc.geyser.utils.LocaleUtils;
import javax.annotation.Nonnull;
import java.util.*;
@@ -65,7 +65,7 @@ public abstract class ItemTranslator {
for (Class clazz : FileUtils.getGeneratedClassesForAnnotation(ItemRemapper.class)) {
int priority = clazz.getAnnotation(ItemRemapper.class).priority();
- GeyserConnector.getInstance().getLogger().debug("Found annotated item translator: " + clazz.getCanonicalName());
+ GeyserImpl.getInstance().getLogger().debug("Found annotated item translator: " + clazz.getCanonicalName());
try {
if (NbtItemStackTranslator.class.isAssignableFrom(clazz)) {
@@ -78,7 +78,7 @@ public abstract class ItemTranslator {
for (ItemMapping item : appliedItems) {
ItemTranslator registered = ITEM_STACK_TRANSLATORS.get(item.getJavaId());
if (registered != null) {
- GeyserConnector.getInstance().getLogger().error("Could not instantiate annotated item translator " +
+ GeyserImpl.getInstance().getLogger().error("Could not instantiate annotated item translator " +
clazz.getCanonicalName() + ". Item translator " + registered.getClass().getCanonicalName() +
" is already registered for the item " + item.getJavaIdentifier());
continue;
@@ -86,7 +86,7 @@ public abstract class ItemTranslator {
ITEM_STACK_TRANSLATORS.put(item.getJavaId(), itemStackTranslator);
}
} catch (InstantiationException | IllegalAccessException e) {
- GeyserConnector.getInstance().getLogger().error("Could not instantiate annotated item translator " + clazz.getCanonicalName());
+ GeyserImpl.getInstance().getLogger().error("Could not instantiate annotated item translator " + clazz.getCanonicalName());
}
}
@@ -134,7 +134,7 @@ public abstract class ItemTranslator {
ItemMapping bedrockItem = session.getItemMappings().getMapping(stack);
if (bedrockItem == null) {
- session.getConnector().getLogger().debug("No matching ItemMapping for " + stack);
+ session.getGeyser().getLogger().debug("No matching ItemMapping for " + stack);
return ItemData.AIR;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/NbtItemStackTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/NbtItemStackTranslator.java
index a7044c3b2..bac48bdd0 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/NbtItemStackTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/NbtItemStackTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item;
+package org.geysermc.geyser.network.translators.item;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
public class NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/Potion.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/Potion.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/Potion.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/Potion.java
index 57f8c756c..dea1e9d21 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/Potion.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/Potion.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item;
+package org.geysermc.geyser.network.translators.item;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/StoredItemMappings.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/StoredItemMappings.java
index 6bbdb7421..14ca7758f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/StoredItemMappings.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/StoredItemMappings.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item;
+package org.geysermc.geyser.network.translators.item;
import lombok.Getter;
import lombok.experimental.Accessors;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMapping;
import javax.annotation.Nonnull;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/TippedArrowPotion.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/TippedArrowPotion.java
index 312de593c..ad6850717 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/TippedArrowPotion.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/TippedArrowPotion.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item;
+package org.geysermc.geyser.network.translators.item;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/BannerTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/BannerTranslator.java
index d00bf9d40..f905d015e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/BannerTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators;
+package org.geysermc.geyser.network.translators.item.translators;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.*;
@@ -32,12 +32,12 @@ import com.nukkitx.nbt.NbtMap;
import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.nbt.NbtType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/CompassTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/CompassTranslator.java
index cf2e90fdf..7eb3f7a3e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/CompassTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/CompassTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators;
+package org.geysermc.geyser.network.translators.item.translators;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.*;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/PotionTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/PotionTranslator.java
index 82e8fb6b8..6c7cde0b0 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/PotionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/PotionTranslator.java
@@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators;
+package org.geysermc.geyser.network.translators.item.translators;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.Potion;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.Potion;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
import java.util.List;
import java.util.stream.Collectors;
@@ -68,7 +68,7 @@ public class PotionTranslator extends ItemTranslator {
.count(itemStack.getAmount())
.tag(translateNbtToBedrock(itemStack.getNbt()));
}
- GeyserConnector.getInstance().getLogger().debug("Unknown Java potion: " + potionTag.getValue());
+ GeyserImpl.getInstance().getLogger().debug("Unknown Java potion: " + potionTag.getValue());
}
return super.translateToBedrock(itemStack, mapping, mappings);
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/TippedArrowTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/TippedArrowTranslator.java
index 575f3ba74..7c2f929ee 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/TippedArrowTranslator.java
@@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators;
+package org.geysermc.geyser.network.translators.item.translators;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.network.translators.item.TippedArrowPotion;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.network.translators.item.TippedArrowPotion;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
import java.util.List;
import java.util.stream.Collectors;
@@ -76,7 +76,7 @@ public class TippedArrowTranslator extends ItemTranslator {
.count(itemStack.getAmount())
.tag(translateNbtToBedrock(itemStack.getNbt()));
}
- GeyserConnector.getInstance().getLogger().debug("Unknown Java potion (tipped arrow): " + potionTag.getValue());
+ GeyserImpl.getInstance().getLogger().debug("Unknown Java potion (tipped arrow): " + potionTag.getValue());
}
return super.translateToBedrock(itemStack, mapping, mappings);
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/AxolotlBucketTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/AxolotlBucketTranslator.java
index f62ac05ae..0cf9c5041 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/AxolotlBucketTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/AxolotlBucketTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.LocaleUtils;
@ItemRemapper
public class AxolotlBucketTranslator extends NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BasicItemTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BasicItemTranslator.java
index b6b1dfac6..d0a7d93a3 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BasicItemTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.*;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.ItemUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.ItemUtils;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BookPagesTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BookPagesTranslator.java
index f1bf69f64..0ee644359 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/BookPagesTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/CrossbowTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/CrossbowTranslator.java
index b0e55737f..21deac983 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/CrossbowTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/CrossbowTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.*;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
@ItemRemapper
public class CrossbowTranslator extends NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantedBookTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantedBookTranslator.java
index 0bca7a8ba..5dfdb192a 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantedBookTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
@ItemRemapper(priority = 1)
public class EnchantedBookTranslator extends NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantmentTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantmentTranslator.java
index b5807a7f4..f4352f3c3 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/EnchantmentTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.*;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.network.translators.item.Enchantment;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.network.translators.item.Enchantment;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.ArrayList;
import java.util.List;
@@ -107,7 +107,7 @@ public class EnchantmentTranslator extends NbtItemStackTranslator {
enchantments.add(javaTag);
}
} else {
- GeyserConnector.getInstance().getLogger().debug("Unknown bedrock enchantment: " + bedrockId);
+ GeyserImpl.getInstance().getLogger().debug("Unknown bedrock enchantment: " + bedrockId);
}
}
if (!enchantments.isEmpty()) {
@@ -131,7 +131,7 @@ public class EnchantmentTranslator extends NbtItemStackTranslator {
Enchantment enchantment = Enchantment.getByJavaIdentifier(((StringTag) javaEnchId).getValue());
if (enchantment == null) {
- GeyserConnector.getInstance().getLogger().debug("Unknown java enchantment: " + javaEnchId.getValue());
+ GeyserImpl.getInstance().getLogger().debug("Unknown java enchantment: " + javaEnchId.getValue());
return null;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkBaseTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkBaseTranslator.java
index b61448d81..31e58f984 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkBaseTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkBaseTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag;
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.utils.FireworkColor;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.utils.FireworkColor;
+import org.geysermc.geyser.utils.MathUtils;
/**
* Stores common code for firework rockets and firework stars.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkRocketTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkRocketTranslator.java
index 1ce94c5b0..624c7b5ff 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkRocketTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkRocketTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.MathUtils;
@ItemRemapper
public class FireworkRocketTranslator extends FireworkBaseTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkStarTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkStarTranslator.java
index 38eca4856..68c87f2cb 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/FireworkStarTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/FireworkStarTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.registry.type.ItemMapping;
@ItemRemapper
public class FireworkStarTranslator extends FireworkBaseTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LeatherArmorTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LeatherArmorTranslator.java
index 0fd6f1e7b..abd6e24ed 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LeatherArmorTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.Arrays;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LodestoneCompassTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LodestoneCompassTranslator.java
index 2696a39cf..25c00ec0a 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LodestoneCompassTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/LodestoneCompassTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.*;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
@ItemRemapper
public class LodestoneCompassTranslator extends NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/MapItemTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/MapItemTranslator.java
index 14342a8b3..9eb1693c8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/MapItemTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.*;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
@ItemRemapper
public class MapItemTranslator extends NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/PlayerHeadTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/PlayerHeadTranslator.java
index 152c28daa..a3f3f10a0 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/PlayerHeadTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/PlayerHeadTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.LocaleUtils;
@ItemRemapper
public class PlayerHeadTranslator extends NbtItemStackTranslator {
@@ -50,7 +50,7 @@ public class PlayerHeadTranslator extends NbtItemStackTranslator {
if (skullOwner instanceof CompoundTag && (skullName = ((CompoundTag) skullOwner).get("Name")) != null) {
name = skullName;
} else {
- session.getConnector().getLogger().debug("Not sure how to handle skull head item display. " + itemTag);
+ session.getGeyser().getLogger().debug("Not sure how to handle skull head item display. " + itemTag);
return;
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java
index 7c737ba13..f7fbbab54 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/ShulkerBoxItemTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.mc.protocol.data.game.Identifier;
import com.github.steveice10.opennbt.tag.builtin.*;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.*;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.item.*;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.MathUtils;
@ItemRemapper
public class ShulkerBoxItemTranslator extends NbtItemStackTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java
index 2cbaea910..6b6d17933 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/item/translators/nbt/TropicalFishBucketTranslator.java
@@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.item.translators.nbt;
+package org.geysermc.geyser.network.translators.item.translators.nbt;
import com.github.steveice10.opennbt.tag.builtin.*;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.Style;
import net.kyori.adventure.text.format.TextDecoration;
-import org.geysermc.connector.entity.living.animal.TropicalFishEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.entity.living.animal.TropicalFishEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.ItemRemapper;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.item.NbtItemStackTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.LocaleUtils;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaAwardStatsTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaAwardStatsTranslator.java
index 141079755..2258f6f16 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaAwardStatsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaAwardStatsTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundAwardStatsPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.StatisticsUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.StatisticsUtils;
@Translator(packet = ClientboundAwardStatsPacket.class)
public class JavaAwardStatsTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaBossEventTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaBossEventTranslator.java
index eae326538..994783f86 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaBossEventTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaBossEventTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.BossBar;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.BossBar;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundBossEventPacket;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChangeDifficultyTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChangeDifficultyTranslator.java
index 37660ef99..71f914a75 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaChangeDifficultyTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChangeDifficultyTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundChangeDifficultyPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import com.nukkitx.protocol.bedrock.packet.SetDifficultyPacket;
@Translator(packet = ClientboundChangeDifficultyPacket.class)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChatTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChatTranslator.java
index 0b6683f8b..8e9984124 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaChatTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaChatTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundChatPacket;
import com.nukkitx.protocol.bedrock.packet.TextPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = ClientboundChatPacket.class)
public class JavaChatTranslator extends PacketTranslator {
@@ -40,7 +40,7 @@ public class JavaChatTranslator extends PacketTranslator
TextPacket textPacket = new TextPacket();
textPacket.setPlatformChatId("");
textPacket.setSourceName("");
- textPacket.setXuid(session.getAuthData().getXboxUUID());
+ textPacket.setXuid(session.getAuthData().getXuid());
textPacket.setType(switch (packet.getType()) {
case CHAT -> TextPacket.Type.CHAT;
case SYSTEM -> TextPacket.Type.SYSTEM;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCommandsTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCommandsTranslator.java
index 28d965902..68ac54302 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCommandsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCommandsTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.data.game.command.CommandNode;
import com.github.steveice10.mc.protocol.data.game.command.CommandParser;
@@ -42,14 +42,14 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap;
import lombok.Getter;
import lombok.ToString;
import net.kyori.adventure.text.format.NamedTextColor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.item.Enchantment;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.EntityUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.item.Enchantment;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.EntityUtils;
import java.util.*;
@@ -100,8 +100,8 @@ public class JavaCommandsTranslator extends PacketTranslator {
- private final GeyserLogger logger = GeyserConnector.getInstance().getLogger();
+ private final GeyserLogger logger = GeyserImpl.getInstance().getLogger();
@Override
public void translate(GeyserSession session, ClientboundCustomPayloadPacket packet) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomQueryTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomQueryTranslator.java
index 69567957c..e8a1bb6a7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaCustomQueryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaCustomQueryTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundCustomQueryPacket;
import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundCustomQueryPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
/**
* For the login cycle.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaDisconnectTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaDisconnectTranslator.java
index 58493b14d..2d1b83413 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaDisconnectTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaDisconnectTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDisconnectPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = ClientboundDisconnectPacket.class)
public class JavaDisconnectTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaGameProfileTranslator.java
similarity index 81%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaGameProfileTranslator.java
index 326ad97ac..0458b9dbc 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaGameProfileTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaGameProfileTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.skin.SkinManager;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.skin.SkinManager;
@Translator(packet = ClientboundGameProfilePacket.class)
public class JavaGameProfileTranslator extends PacketTranslator {
@@ -47,7 +47,7 @@ public class JavaGameProfileTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginTranslator.java
index 772e65846..8fb5c29e7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaLoginTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaLoginTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.data.game.entity.player.HandPreference;
import com.github.steveice10.mc.protocol.data.game.setting.ChatVisibility;
@@ -34,15 +34,15 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCu
import com.nukkitx.protocol.bedrock.data.GameRuleData;
import com.nukkitx.protocol.bedrock.data.PlayerPermission;
import com.nukkitx.protocol.bedrock.packet.*;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.BiomeTranslator;
-import org.geysermc.connector.utils.ChunkUtils;
-import org.geysermc.connector.utils.DimensionUtils;
-import org.geysermc.connector.utils.PluginMessageUtils;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.world.BiomeTranslator;
+import org.geysermc.geyser.utils.ChunkUtils;
+import org.geysermc.geyser.utils.DimensionUtils;
+import org.geysermc.geyser.utils.PluginMessageUtils;
import java.util.Arrays;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaPingTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaPingTranslator.java
index 060ddef93..d71d733cb 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaPingTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaPingTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundPongPacket;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPingPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
// Why does this packet exist? Whatever, we better implement it
@Translator(packet = ClientboundPingPacket.class)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRecipeTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRecipeTranslator.java
index d70b1e929..64c82b3fe 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaRecipeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRecipeTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.data.game.UnlockRecipesAction;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundRecipePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRespawnTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRespawnTranslator.java
index 0ae81482c..80484a50f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaRespawnTranslator.java
@@ -23,21 +23,21 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundRespawnPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
import com.nukkitx.protocol.bedrock.packet.SetPlayerGameTypePacket;
-import org.geysermc.connector.entity.attribute.GeyserAttributeType;
-import org.geysermc.connector.entity.player.SessionPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.utils.ChunkUtils;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.utils.ChunkUtils;
+import org.geysermc.geyser.utils.DimensionUtils;
@Translator(packet = ClientboundRespawnPacket.class)
public class JavaRespawnTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaSelectAdvancementsTabTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaSelectAdvancementsTabTranslator.java
index 16e5f9de9..a3606f598 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaSelectAdvancementsTabTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaSelectAdvancementsTabTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSelectAdvancementsTabPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.AdvancementsCache;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.AdvancementsCache;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
/**
* Indicates that the client should open a particular advancement tab
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateAdvancementsTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateAdvancementsTranslator.java
index cd1a5dbec..3dd9306b8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateAdvancementsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateAdvancementsTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.data.game.advancement.Advancement;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateAdvancementsPacket;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.network.session.cache.AdvancementsCache;
-import org.geysermc.connector.utils.GeyserAdvancement;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.cache.AdvancementsCache;
+import org.geysermc.geyser.utils.GeyserAdvancement;
+import org.geysermc.geyser.utils.LocaleUtils;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateRecipesTranslator.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateRecipesTranslator.java
index 9306453bc..f5ec74056 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateRecipesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateRecipesTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
@@ -40,18 +40,18 @@ import com.nukkitx.protocol.bedrock.packet.CraftingDataPacket;
import it.unimi.dsi.fastutil.ints.*;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.*;
import java.util.stream.Collectors;
-import static org.geysermc.connector.utils.InventoryUtils.LAST_RECIPE_NET_ID;
+import static org.geysermc.geyser.utils.InventoryUtils.LAST_RECIPE_NET_ID;
/**
* Used to send all valid recipes from Java to Bedrock.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateTagsTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateTagsTranslator.java
index 4330b2e91..2ff0d346c 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/JavaUpdateTagsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/JavaUpdateTagsTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.geyser.network.translators.java;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateTagsPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundUpdateTagsPacket.class)
public class JavaUpdateTagsTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaAnimateTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaAnimateTranslator.java
index 11fec73b3..1e6aad75e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaAnimateTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaAnimateTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.AnimateEntityPacket;
import com.nukkitx.protocol.bedrock.packet.AnimatePacket;
import com.nukkitx.protocol.bedrock.packet.SpawnParticleEffectPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.DimensionUtils;
@Translator(packet = ClientboundAnimatePacket.class)
public class JavaAnimateTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaEntityEventTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaEntityEventTranslator.java
index cdf21234c..e41232865 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEventTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaEntityEventTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundEntityEventPacket;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
@@ -32,13 +32,13 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.*;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.FishingHookEntity;
-import org.geysermc.connector.entity.LivingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.FishingHookEntity;
+import org.geysermc.geyser.entity.LivingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.concurrent.ThreadLocalRandom;
@@ -220,7 +220,7 @@ public class JavaEntityEventTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosTranslator.java
index 158c8c8d0..710f9b8dd 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityPosTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityPosTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundMoveEntityPosPacket.class)
public class JavaMoveEntityPosTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityRotTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityRotTranslator.java
index 519b30909..fa7c7cd47 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveEntityRotTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveEntityRotTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityRotPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundMoveEntityRotPacket.class)
public class JavaMoveEntityRotTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveVehicleTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveVehicleTranslator.java
index cb15572a1..522fdc548 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaMoveVehicleTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaMoveVehicleTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveVehiclePacket;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundMoveVehiclePacket.class)
public class JavaMoveVehicleTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
index e0592f34d..ea21ecd9b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRemoveEntitiesPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundRemoveEntitiesPacket.class)
public class JavaRemoveEntitiesTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveMobEffectTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveMobEffectTranslator.java
index 057af9667..1cab3fac1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveMobEffectTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRemoveMobEffectTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRemoveMobEffectPacket;
import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.EntityUtils;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.EntityUtils;
@Translator(packet = ClientboundRemoveMobEffectPacket.class)
public class JavaRemoveMobEffectTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRotateHeadTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRotateHeadTranslator.java
index 57c34db4f..d9595034b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRotateHeadTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaRotateHeadTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRotateHeadPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundRotateHeadPacket.class)
public class JavaRotateHeadTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityDataTranslator.java
similarity index 76%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityDataTranslator.java
index 25a7958df..37803bffc 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityDataTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityDataTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.EntityMetadataTranslator;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.InteractiveTagManager;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.EntityMetadataTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.InteractiveTagManager;
import java.util.List;
@@ -55,9 +55,9 @@ public class JavaSetEntityDataTranslator extends PacketTranslator definition = entity.getDefinition();
for (EntityMetadata metadata : packet.getMetadata()) {
if (metadata.getId() >= definition.translators().size()) {
- session.getConnector().getLogger().warning("Metadata ID " + metadata.getId() + " is out of bounds of known entity metadata size " + definition.translators().size() + " for entity type " + entity.getDefinition().entityType());
- if (session.getConnector().getConfig().isDebugMode()) {
- session.getConnector().getLogger().debug(metadata.toString());
+ session.getGeyser().getLogger().warning("Metadata ID " + metadata.getId() + " is out of bounds of known entity metadata size " + definition.translators().size() + " for entity type " + entity.getDefinition().entityType());
+ if (session.getGeyser().getConfig().isDebugMode()) {
+ session.getGeyser().getLogger().debug(metadata.toString());
}
continue;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityLinkTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityLinkTranslator.java
index 27e0481ee..aeae1a7e5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityLinkTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityLinkTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityLinkPacket;
import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.MobEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.MobEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
/**
* Called when a leash is attached, removed or updated from an entity
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityMotionTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityMotionTranslator.java
index 3ec366825..886ba0c04 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEntityMotionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEntityMotionTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.ItemEntity;
-import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.ItemEntity;
+import org.geysermc.geyser.entity.living.animal.horse.AbstractHorseEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityMotionPacket;
import com.nukkitx.math.vector.Vector3f;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEquipmentTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEquipmentTranslator.java
index 9e84b85a1..3e3ec0e8b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaSetEquipmentTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaSetEquipmentTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Equipment;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEquipmentPacket;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.LivingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.LivingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
@Translator(packet = ClientboundSetEquipmentPacket.class)
public class JavaSetEquipmentTranslator extends PacketTranslator {
@@ -51,7 +51,7 @@ public class JavaSetEquipmentTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateAttributesTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateAttributesTranslator.java
index 84946c208..005150693 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateAttributesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateAttributesTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundUpdateAttributesPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.LivingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.LivingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundUpdateAttributesPacket.class)
public class JavaUpdateAttributesTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateMobEffectTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateMobEffectTranslator.java
index f8c276896..89d1068cb 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaUpdateMobEffectTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/JavaUpdateMobEffectTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity;
+package org.geysermc.geyser.network.translators.java.entity;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundUpdateMobEffectPacket;
import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.EntityUtils;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.EntityUtils;
@Translator(packet = ClientboundUpdateMobEffectPacket.class)
public class JavaUpdateMobEffectTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java
index c2941a5ae..732db378b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaBlockBreakAckTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.player;
+package org.geysermc.geyser.network.translators.java.entity.player;
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundBlockBreakAckPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.utils.ChunkUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.utils.ChunkUtils;
@Translator(packet = ClientboundBlockBreakAckPacket.class)
public class JavaBlockBreakAckTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java
index a03bfceb1..dea92355d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerAbilitiesTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.player;
+package org.geysermc.geyser.network.translators.java.entity.player;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerAbilitiesPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundPlayerAbilitiesPacket.class)
public class JavaPlayerAbilitiesTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerInfoTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerInfoTranslator.java
index d7bfd5d72..d9365fffb 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerInfoTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaPlayerInfoTranslator.java
@@ -23,19 +23,19 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.player;
+package org.geysermc.geyser.network.translators.java.entity.player;
import com.github.steveice10.mc.protocol.data.game.PlayerListEntry;
import com.github.steveice10.mc.protocol.data.game.PlayerListEntryAction;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPlayerInfoPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.PlayerListPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.skin.SkinManager;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.skin.SkinManager;
@Translator(packet = ClientboundPlayerInfoPacket.class)
public class JavaPlayerInfoTranslator extends PacketTranslator {
@@ -84,7 +84,7 @@ public class JavaPlayerInfoTranslator extends PacketTranslator
- GeyserConnector.getInstance().getLogger().debug("Loaded Local Bedrock Java Skin Data for " + session.getClientData().getUsername()));
+ GeyserImpl.getInstance().getLogger().debug("Loaded Local Bedrock Java Skin Data for " + session.getClientData().getUsername()));
} else {
playerEntity.setValid(true);
PlayerListPacket.Entry playerListEntry = SkinManager.buildCachedEntry(session, playerEntity);
@@ -102,7 +102,7 @@ public class JavaPlayerInfoTranslator extends PacketTranslator {
@@ -84,7 +84,7 @@ public class JavaPlayerPositionTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetExperienceTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetExperienceTranslator.java
index 61427b3b2..db0d92e02 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetExperienceTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetExperienceTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.player;
+package org.geysermc.geyser.network.translators.java.entity.player;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetExperiencePacket;
import com.nukkitx.protocol.bedrock.data.AttributeData;
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
-import org.geysermc.connector.entity.attribute.GeyserAttributeType;
-import org.geysermc.connector.entity.player.SessionPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetHealthTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetHealthTranslator.java
index 11e8ab21b..4e30983c3 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaSetHealthTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/player/JavaSetHealthTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.player;
+package org.geysermc.geyser.network.translators.java.entity.player;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHealthPacket;
import com.nukkitx.protocol.bedrock.data.AttributeData;
import com.nukkitx.protocol.bedrock.packet.SetHealthPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
-import org.geysermc.connector.entity.attribute.GeyserAttributeType;
-import org.geysermc.connector.entity.player.SessionPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
+import org.geysermc.geyser.entity.player.SessionPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddEntityTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddEntityTranslator.java
index cf75dbd0f..9ab1d390c 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.spawn;
+package org.geysermc.geyser.network.translators.java.entity.spawn;
import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
import com.github.steveice10.mc.protocol.data.game.entity.object.FallingBlockData;
@@ -31,14 +31,14 @@ import com.github.steveice10.mc.protocol.data.game.entity.object.ProjectileData;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddEntityPacket;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.*;
-import org.geysermc.connector.entity.factory.BaseEntityFactory;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.entity.*;
+import org.geysermc.geyser.entity.factory.BaseEntityFactory;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.LanguageUtils;
@Translator(packet = ClientboundAddEntityPacket.class)
public class JavaAddEntityTranslator extends PacketTranslator {
@@ -52,7 +52,7 @@ public class JavaAddEntityTranslator extends PacketTranslator definition = Registries.ENTITY_DEFINITIONS.get(packet.getType());
if (definition == null) {
- session.getConnector().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.entity.type_null", packet.getType()));
+ session.getGeyser().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.entity.type_null", packet.getType()));
return;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java
index ec2ab1221..ff7eeeb79 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddExperienceOrbTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.spawn;
+package org.geysermc.geyser.network.translators.java.entity.spawn;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddExperienceOrbPacket;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.ExpOrbEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.ExpOrbEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundAddExperienceOrbPacket.class)
public class JavaAddExperienceOrbTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddMobTranslator.java
similarity index 77%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddMobTranslator.java
index a3d7ebb0d..424be58e8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddMobTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddMobTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.spawn;
+package org.geysermc.geyser.network.translators.java.entity.spawn;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddMobPacket;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.entity.factory.BaseEntityFactory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.entity.factory.BaseEntityFactory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.LanguageUtils;
@Translator(packet = ClientboundAddMobPacket.class)
public class JavaAddMobTranslator extends PacketTranslator {
@@ -46,7 +46,7 @@ public class JavaAddMobTranslator extends PacketTranslator definition = Registries.ENTITY_DEFINITIONS.get(packet.getType());
if (definition == null) {
- session.getConnector().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.entity.type_null", packet.getType()));
+ session.getGeyser().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.entity.type_null", packet.getType()));
return;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java
index 4879166a2..fe523a032 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPaintingTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.spawn;
+package org.geysermc.geyser.network.translators.java.entity.spawn;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddPaintingPacket;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.PaintingEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.PaintingType;
+import org.geysermc.geyser.entity.PaintingEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.PaintingType;
@Translator(packet = ClientboundAddPaintingPacket.class)
public class JavaAddPaintingTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java
similarity index 81%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java
index 9daec1007..24d7cb705 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/entity/spawn/JavaAddPlayerTranslator.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.entity.spawn;
+package org.geysermc.geyser.network.translators.java.entity.spawn;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddPlayerPacket;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.LanguageUtils;
-import org.geysermc.connector.skin.SkinManager;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.LanguageUtils;
+import org.geysermc.geyser.skin.SkinManager;
@Translator(packet = ClientboundAddPlayerPacket.class)
public class JavaAddPlayerTranslator extends PacketTranslator {
@@ -52,7 +52,7 @@ public class JavaAddPlayerTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetContentTranslator.java
similarity index 82%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetContentTranslator.java
index 85b055a5a..dcc6968c5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetContentTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetContentTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.inventory;
+package org.geysermc.geyser.network.translators.java.inventory;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetContentPacket;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
@Translator(packet = ClientboundContainerSetContentPacket.class)
public class JavaContainerSetContentTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetDataTranslator.java
similarity index 81%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetDataTranslator.java
index e458d202b..d0e767bd1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetDataTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetDataTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.inventory;
+package org.geysermc.geyser.network.translators.java.inventory;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetDataPacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
@Translator(packet = ClientboundContainerSetDataPacket.class)
public class JavaContainerSetDataTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetSlotTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetSlotTranslator.java
index 5079084dc..9957439af 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaContainerSetSlotTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaContainerSetSlotTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.inventory;
+package org.geysermc.geyser.network.translators.java.inventory;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
@@ -37,16 +37,16 @@ import com.nukkitx.protocol.bedrock.data.inventory.CraftingData;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.CraftingDataPacket;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.CraftingInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.PlayerInventoryTranslator;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.CraftingInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.PlayerInventoryTranslator;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.Arrays;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java
index bb3edfd5b..26d836532 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaHorseScreenOpenTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.inventory;
+package org.geysermc.geyser.network.translators.java.inventory;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundHorseScreenOpenPacket;
import com.nukkitx.nbt.NbtMap;
@@ -31,18 +31,18 @@ import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.nbt.NbtType;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.packet.UpdateEquipPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.animal.horse.ChestedHorseEntity;
-import org.geysermc.connector.entity.living.animal.horse.LlamaEntity;
-import org.geysermc.connector.inventory.Container;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.horse.DonkeyInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.horse.HorseInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.horse.LlamaInventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.animal.horse.ChestedHorseEntity;
+import org.geysermc.geyser.entity.living.animal.horse.LlamaEntity;
+import org.geysermc.geyser.inventory.Container;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.horse.DonkeyInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.horse.HorseInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.horse.LlamaInventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaMerchantOffersTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaMerchantOffersTranslator.java
index 61b8471c6..799f7051a 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaMerchantOffersTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaMerchantOffersTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.inventory;
+package org.geysermc.geyser.network.translators.java.inventory;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade;
@@ -35,14 +35,14 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.UpdateTradePacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.MerchantContainer;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.MerchantContainer;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaOpenScreenTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaOpenScreenTranslator.java
index 5ce06c08a..bd2f9d3a2 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/inventory/JavaOpenScreenTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/inventory/JavaOpenScreenTranslator.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.inventory;
+package org.geysermc.geyser.network.translators.java.inventory;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundOpenScreenPacket;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClosePacket;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.utils.InventoryUtils;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.utils.InventoryUtils;
+import org.geysermc.geyser.utils.LocaleUtils;
@Translator(packet = ClientboundOpenScreenPacket.class)
public class JavaOpenScreenTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockDestructionTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockDestructionTranslator.java
index 3b0e4d891..56b78f74b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockDestructionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockDestructionTranslator.java
@@ -23,26 +23,26 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockDestructionPacket;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.utils.BlockUtils;
@Translator(packet = ClientboundBlockDestructionPacket.class)
public class JavaBlockDestructionTranslator extends PacketTranslator {
@Override
public void translate(GeyserSession session, ClientboundBlockDestructionPacket packet) {
- int state = session.getConnector().getWorldManager().getBlockAt(session, packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ());
+ int state = session.getGeyser().getWorldManager().getBlockAt(session, packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ());
int breakTime = (int) (65535 / Math.ceil(BlockUtils.getBreakTime(session, BlockRegistries.JAVA_BLOCKS.get(state), ItemMapping.AIR, new CompoundTag(""), false) * 20));
LevelEventPacket levelEventPacket = new LevelEventPacket();
levelEventPacket.setPosition(Vector3f.from(
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEntityDataTranslator.java
similarity index 83%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEntityDataTranslator.java
index d68823d1a..aa756d094 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockEntityDataTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockEntityDataTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
@@ -32,14 +32,14 @@ import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.Clientb
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
-import org.geysermc.connector.network.translators.world.block.entity.RequiresBlockState;
-import org.geysermc.connector.network.translators.world.block.entity.SkullBlockEntityTranslator;
-import org.geysermc.connector.utils.BlockEntityUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator;
+import org.geysermc.geyser.network.translators.world.block.entity.RequiresBlockState;
+import org.geysermc.geyser.network.translators.world.block.entity.SkullBlockEntityTranslator;
+import org.geysermc.geyser.utils.BlockEntityUtils;
@Translator(packet = ClientboundBlockEntityDataPacket.class)
public class JavaBlockEntityDataTranslator extends PacketTranslator {
@@ -51,7 +51,7 @@ public class JavaBlockEntityDataTranslator extends PacketTranslator {
@@ -67,18 +67,18 @@ public class JavaBlockEventTranslator extends PacketTranslator {
- int blockId = session.getConnector().getWorldManager().getBlockAt(session, position);
+ int blockId = session.getGeyser().getWorldManager().getBlockAt(session, position);
boolean sticky = BlockStateValues.isStickyPiston(blockId);
boolean extended = action != PistonValueType.PUSHING;
return new PistonBlockEntity(session, pos, direction, sticky, extended);
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockUpdateTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockUpdateTranslator.java
index f0042ae00..aa5a3ac56 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaBlockUpdateTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaBlockUpdateTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockUpdatePacket;
@@ -31,12 +31,12 @@ import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.utils.ChunkUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.utils.ChunkUtils;
@Translator(packet = ClientboundBlockUpdatePacket.class)
public class JavaBlockUpdateTranslator extends PacketTranslator {
@@ -44,8 +44,8 @@ public class JavaBlockUpdateTranslator extends PacketTranslator {
@@ -47,7 +47,7 @@ public class JavaCustomSoundTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaForgetLevelChunkTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaForgetLevelChunkTranslator.java
index aba3c746a..f800d77a8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaForgetLevelChunkTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaForgetLevelChunkTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundForgetLevelChunkPacket;
import com.nukkitx.math.vector.Vector3i;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
import java.util.Iterator;
@@ -50,7 +50,7 @@ public class JavaForgetLevelChunkTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelChunkWithLightTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelChunkWithLightTranslator.java
index 9fd862dfe..1bd0959c5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelChunkWithLightTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelChunkWithLightTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.data.game.chunk.BitStorage;
import com.github.steveice10.mc.protocol.data.game.chunk.ChunkSection;
@@ -49,29 +49,29 @@ import io.netty.buffer.ByteBufOutputStream;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.ints.IntLists;
-import org.geysermc.connector.entity.ItemFrameEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.BiomeTranslator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.world.block.entity.BedrockOnlyBlockEntity;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
-import org.geysermc.connector.network.translators.world.block.entity.SkullBlockEntityTranslator;
-import org.geysermc.connector.network.translators.world.chunk.BlockStorage;
-import org.geysermc.connector.network.translators.world.chunk.GeyserChunkSection;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArray;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArrayVersion;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.SingletonBitArray;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.utils.BlockEntityUtils;
-import org.geysermc.connector.utils.ChunkUtils;
+import org.geysermc.geyser.entity.ItemFrameEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.world.BiomeTranslator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.entity.BedrockOnlyBlockEntity;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator;
+import org.geysermc.geyser.network.translators.world.block.entity.SkullBlockEntityTranslator;
+import org.geysermc.geyser.network.translators.world.chunk.BlockStorage;
+import org.geysermc.geyser.network.translators.world.chunk.GeyserChunkSection;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArray;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArrayVersion;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.SingletonBitArray;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.utils.BlockEntityUtils;
+import org.geysermc.geyser.utils.ChunkUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.*;
-import static org.geysermc.connector.utils.ChunkUtils.*;
+import static org.geysermc.geyser.utils.ChunkUtils.*;
@Translator(packet = ClientboundLevelChunkWithLightPacket.class)
public class JavaLevelChunkWithLightTranslator extends PacketTranslator {
@@ -258,7 +258,7 @@ public class JavaLevelChunkWithLightTranslator extends PacketTranslator effectPacket.setType(LevelEventType.PARTICLE_WAX_OFF);
case SCRAPE -> effectPacket.setType(LevelEventType.PARTICLE_SCRAPE);
default -> {
- GeyserConnector.getInstance().getLogger().debug("Unhandled particle event: " + particleEvent.name());
+ GeyserImpl.getInstance().getLogger().debug("Unhandled particle event: " + particleEvent.name());
return;
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelParticlesTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelParticlesTranslator.java
index c4ca16042..f0d14c392 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaLevelParticlesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaLevelParticlesTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.level.particle.*;
@@ -34,13 +34,13 @@ import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
import com.nukkitx.protocol.bedrock.packet.SpawnParticleEffectPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ParticleMapping;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ParticleMapping;
+import org.geysermc.geyser.utils.DimensionUtils;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
@@ -70,7 +70,7 @@ public class JavaLevelParticlesTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java
index 11958b832..49c852bcf 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSectionBlocksUpdateTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSectionBlocksUpdatePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.ChunkUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.ChunkUtils;
@Translator(packet = ClientboundSectionBlocksUpdatePacket.class)
public class JavaSectionBlocksUpdateTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java
index 6ddbf8eea..a9c0526a8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheCenterTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheCenterPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.ChunkUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.ChunkUtils;
import com.nukkitx.math.vector.Vector3i;
@Translator(packet = ClientboundSetChunkCacheCenterPacket.class)
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java
index 29c2ed094..f170d430c 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetChunkCacheRadiusTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheRadiusPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetChunkCacheRadiusPacket.class)
public class JavaSetChunkCacheRadiusTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java
index 025b09882..fbae567fc 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetDefaultSpawnPositionTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetDefaultSpawnPositionPacket;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.packet.SetSpawnPositionPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.utils.DimensionUtils;
@Translator(packet = ClientboundSetDefaultSpawnPositionPacket.class)
public class JavaSetDefaultSpawnPositionTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetTimeTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetTimeTranslator.java
index 1c2081bc3..62ee60d2d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSetTimeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSetTimeTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket;
import com.nukkitx.protocol.bedrock.packet.SetTimePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetTimePacket.class)
public class JavaSetTimeTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSoundTranslator.java
similarity index 82%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSoundTranslator.java
index dbf331aa2..7e6d1f979 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/JavaSoundTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/JavaSoundTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level;
+package org.geysermc.geyser.network.translators.java.level;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSoundPacket;
import com.nukkitx.math.vector.Vector3f;
@@ -31,14 +31,14 @@ import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.utils.SoundUtils;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.SoundMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.utils.SoundUtils;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.SoundMapping;
@Translator(packet = ClientboundSoundPacket.class)
public class JavaSoundTranslator extends PacketTranslator {
@@ -49,7 +49,7 @@ public class JavaSoundTranslator extends PacketTranslator {
@@ -55,18 +55,18 @@ public class JavaStopSoundTranslator extends PacketTranslator "
+ soundMapping + (soundMapping == null ? "[not found]" : "")
+ " - " + packet.toString());
String playsound;
if (soundMapping == null || soundMapping.getPlaysound() == null) {
// no mapping
- session.getConnector().getLogger()
+ session.getGeyser().getLogger()
.debug("[StopSound] Defaulting to sound server gave us.");
playsound = packetSound;
} else {
@@ -79,6 +79,6 @@ public class JavaStopSoundTranslator extends PacketTranslator " + stopSoundPacket);
+ session.getGeyser().getLogger().debug("[StopSound] Packet sent - " + packet.toString() + " --> " + stopSoundPacket);
}
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaInitializeBorderTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaInitializeBorderTranslator.java
index 1a3ed5b30..5f1bc1585 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaInitializeBorderTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaInitializeBorderTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level.border;
+package org.geysermc.geyser.network.translators.java.level.border;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundInitializeBorderPacket;
import com.nukkitx.math.vector.Vector2d;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldBorder;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldBorder;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundInitializeBorderPacket.class)
public class JavaInitializeBorderTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderCenterTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderCenterTranslator.java
index 85ad2512e..4051382f4 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderCenterTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderCenterTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level.border;
+package org.geysermc.geyser.network.translators.java.level.border;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderCenterPacket;
import com.nukkitx.math.vector.Vector2d;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldBorder;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldBorder;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetBorderCenterPacket.class)
public class JavaSetBorderCenterTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java
similarity index 85%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java
index bfead0466..7d068b031 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderLerpSizeTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level.border;
+package org.geysermc.geyser.network.translators.java.level.border;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderLerpSizePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldBorder;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldBorder;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetBorderLerpSizePacket.class)
public class JavaSetBorderLerpSizeTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderSizeTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderSizeTranslator.java
index 0de9f339c..12f93d5cc 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderSizeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderSizeTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level.border;
+package org.geysermc.geyser.network.translators.java.level.border;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderSizePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldBorder;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldBorder;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetBorderSizePacket.class)
public class JavaSetBorderSizeTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java
index 850a7186e..9e5b75df1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDelayTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level.border;
+package org.geysermc.geyser.network.translators.java.level.border;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDelayPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldBorder;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldBorder;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetBorderWarningDelayPacket.class)
public class JavaSetBorderWarningDelayTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java
index 33a984357..b3dbc083b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/level/border/JavaSetBorderWarningDistanceTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.level.border;
+package org.geysermc.geyser.network.translators.java.level.border;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDistancePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldBorder;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldBorder;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetBorderWarningDistancePacket.class)
public class JavaSetBorderWarningDistanceTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java
similarity index 83%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java
index be4f4ce8a..ac150d3a1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetDisplayObjectiveTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.scoreboard;
+package org.geysermc.geyser.network.translators.java.scoreboard;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetDisplayObjectivePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldCache;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.scoreboard.Scoreboard;
-import org.geysermc.connector.scoreboard.ScoreboardUpdater;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldCache;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.scoreboard.Scoreboard;
+import org.geysermc.geyser.scoreboard.ScoreboardUpdater;
@Translator(packet = ClientboundSetDisplayObjectivePacket.class)
public class JavaSetDisplayObjectiveTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java
similarity index 82%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java
index 8c1ab9124..77969cf84 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetObjectiveTranslator.java
@@ -23,27 +23,27 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.scoreboard;
+package org.geysermc.geyser.network.translators.java.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ObjectiveAction;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetObjectivePacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldCache;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.scoreboard.Objective;
-import org.geysermc.connector.scoreboard.Scoreboard;
-import org.geysermc.connector.scoreboard.ScoreboardUpdater;
-import org.geysermc.connector.scoreboard.UpdateType;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldCache;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.scoreboard.Objective;
+import org.geysermc.geyser.scoreboard.Scoreboard;
+import org.geysermc.geyser.scoreboard.ScoreboardUpdater;
+import org.geysermc.geyser.scoreboard.UpdateType;
@Translator(packet = ClientboundSetObjectivePacket.class)
public class JavaSetObjectiveTranslator extends PacketTranslator {
- private final GeyserLogger logger = GeyserConnector.getInstance().getLogger();
+ private final GeyserLogger logger = GeyserImpl.getInstance().getLogger();
@Override
public void translate(GeyserSession session, ClientboundSetObjectivePacket packet) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java
index 8d288917a..00b8c76cb 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetPlayerTeamTranslator.java
@@ -23,29 +23,29 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.scoreboard;
+package org.geysermc.geyser.network.translators.java.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.NameTagVisibility;
import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamAction;
import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.scoreboard.Scoreboard;
-import org.geysermc.connector.scoreboard.ScoreboardUpdater;
-import org.geysermc.connector.scoreboard.Team;
-import org.geysermc.connector.scoreboard.UpdateType;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.scoreboard.Scoreboard;
+import org.geysermc.geyser.scoreboard.ScoreboardUpdater;
+import org.geysermc.geyser.scoreboard.Team;
+import org.geysermc.geyser.scoreboard.UpdateType;
import java.util.Arrays;
import java.util.Set;
@Translator(packet = ClientboundSetPlayerTeamPacket.class)
public class JavaSetPlayerTeamTranslator extends PacketTranslator {
- private final GeyserLogger logger = GeyserConnector.getInstance().getLogger();
+ private final GeyserLogger logger = GeyserImpl.getInstance().getLogger();
@Override
public void translate(GeyserSession session, ClientboundSetPlayerTeamPacket packet) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetScoreTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetScoreTranslator.java
index 76e64490b..4216a34dd 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/scoreboard/JavaSetScoreTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/scoreboard/JavaSetScoreTranslator.java
@@ -23,31 +23,31 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.scoreboard;
+package org.geysermc.geyser.network.translators.java.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardAction;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetScorePacket;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldCache;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.scoreboard.Objective;
-import org.geysermc.connector.scoreboard.Scoreboard;
-import org.geysermc.connector.scoreboard.ScoreboardUpdater;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldCache;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.scoreboard.Objective;
+import org.geysermc.geyser.scoreboard.Scoreboard;
+import org.geysermc.geyser.scoreboard.ScoreboardUpdater;
+import org.geysermc.geyser.utils.LanguageUtils;
@Translator(packet = ClientboundSetScorePacket.class)
public class JavaSetScoreTranslator extends PacketTranslator {
private final GeyserLogger logger;
public JavaSetScoreTranslator() {
- logger = GeyserConnector.getInstance().getLogger();
+ logger = GeyserImpl.getInstance().getLogger();
}
@Override
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaClearTitlesTranslator.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaClearTitlesTranslator.java
index b1d1d38ce..b1c42e968 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaClearTitlesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaClearTitlesTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.title;
+package org.geysermc.geyser.network.translators.java.title;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundClearTitlesPacket;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundClearTitlesPacket.class)
public class JavaClearTitlesTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetActionBarTextTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetActionBarTextTranslator.java
index 207599770..b5e5806f7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetActionBarTextTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetActionBarTextTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.title;
+package org.geysermc.geyser.network.translators.java.title;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetActionBarTextPacket;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = ClientboundSetActionBarTextPacket.class)
public class JavaSetActionBarTextTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetSubtitleTextTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetSubtitleTextTranslator.java
index e17debf6b..4865a4e00 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetSubtitleTextTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetSubtitleTextTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.title;
+package org.geysermc.geyser.network.translators.java.title;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetSubtitleTextPacket;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = ClientboundSetSubtitleTextPacket.class)
public class JavaSetSubtitleTextTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitleTextTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitleTextTranslator.java
index fb335fc76..8d54ac704 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitleTextTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitleTextTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.title;
+package org.geysermc.geyser.network.translators.java.title;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetTitleTextPacket;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@Translator(packet = ClientboundSetTitleTextPacket.class)
public class JavaSetTitleTextTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitlesAnimationTranslator.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitlesAnimationTranslator.java
index 20dcc9b3c..e00a61db9 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/java/title/JavaSetTitlesAnimationTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/java/title/JavaSetTitlesAnimationTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.java.title;
+package org.geysermc.geyser.network.translators.java.title;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetTitlesAnimationPacket;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.PacketTranslator;
+import org.geysermc.geyser.network.translators.Translator;
@Translator(packet = ClientboundSetTitlesAnimationPacket.class)
public class JavaSetTitlesAnimationTranslator extends PacketTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/BlockSoundInteractionHandler.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/BlockSoundInteractionHandler.java
index 22ccd158c..7fbc5d6f4 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/BlockSoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/BlockSoundInteractionHandler.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound;
+package org.geysermc.geyser.network.translators.sound;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -31,10 +31,10 @@ import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.BlockUtils;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.BlockUtils;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/EntitySoundInteractionHandler.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/EntitySoundInteractionHandler.java
index 193b90e1c..8adbf0dad 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/EntitySoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/EntitySoundInteractionHandler.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound;
+package org.geysermc.geyser.network.translators.sound;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.Registries;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.Registries;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundHandler.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundHandler.java
index f12e91db2..def77300d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/SoundHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundHandler.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound;
+package org.geysermc.geyser.network.translators.sound;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundInteractionHandler.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundInteractionHandler.java
index 8f25b8e8e..d3370be5f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/SoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/SoundInteractionHandler.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound;
+package org.geysermc.geyser.network.translators.sound;
import com.nukkitx.math.vector.Vector3f;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
/**
* Handler for playing sounds when right-clicking
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/BucketSoundInteractionHandler.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/BucketSoundInteractionHandler.java
index 74f7b7878..7e3148e38 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/BucketSoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/BucketSoundInteractionHandler.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler(items = "bucket", ignoreSneakingWhileHolding = true)
public class BucketSoundInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/ComparatorSoundInteractionHandler.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/ComparatorSoundInteractionHandler.java
index 86a68ad30..31c18d2b3 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/ComparatorSoundInteractionHandler.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler(blocks = "comparator")
public class ComparatorSoundInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/DoorSoundInteractionHandler.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/DoorSoundInteractionHandler.java
index 8c6c62f06..952bf18ae 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/DoorSoundInteractionHandler.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler(blocks = {"door", "fence_gate"})
public class DoorSoundInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/FlintAndSteelInteractionHandler.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/FlintAndSteelInteractionHandler.java
index 794b87086..59d12d202 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/FlintAndSteelInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/FlintAndSteelInteractionHandler.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler(items = "flint_and_steel", ignoreSneakingWhileHolding = true)
public class FlintAndSteelInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/GrassPathInteractionHandler.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/GrassPathInteractionHandler.java
index 32943107f..b9f838e14 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/GrassPathInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/GrassPathInteractionHandler.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
-import org.geysermc.connector.registry.BlockRegistries;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.registry.BlockRegistries;
@SoundHandler(blocks = "grass_path", items = "shovel", ignoreSneakingWhileHolding = true)
public class GrassPathInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/HoeInteractionHandler.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/HoeInteractionHandler.java
index 5402aa16c..7cfbc7813 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/HoeInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/HoeInteractionHandler.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
-import org.geysermc.connector.registry.BlockRegistries;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.registry.BlockRegistries;
@SoundHandler(blocks = "farmland", items = "hoe", ignoreSneakingWhileHolding = true)
public class HoeInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/LeverSoundInteractionHandler.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/block/LeverSoundInteractionHandler.java
index 83fe79f27..5cfaac2ec 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/block/LeverSoundInteractionHandler.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.block;
+package org.geysermc.geyser.network.translators.sound.block;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler(blocks = "lever")
public class LeverSoundInteractionHandler implements BlockSoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/FeedBabySoundInteractionHandler.java
similarity index 81%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/FeedBabySoundInteractionHandler.java
index d7fa03943..fa4c1a48f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/entity/FeedBabySoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/FeedBabySoundInteractionHandler.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.entity;
+package org.geysermc.geyser.network.translators.sound.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.animal.AnimalEntity;
-import org.geysermc.connector.entity.living.animal.OcelotEntity;
-import org.geysermc.connector.entity.living.animal.tameable.CatEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.EntitySoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.animal.AnimalEntity;
+import org.geysermc.geyser.entity.living.animal.OcelotEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.CatEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.EntitySoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler
public class FeedBabySoundInteractionHandler implements EntitySoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java b/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java
index 948b69afb..eb6060378 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/sound/entity/MilkEntitySoundInteractionHandler.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.sound.entity;
+package org.geysermc.geyser.network.translators.sound.entity;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.animal.GoatEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.sound.EntitySoundInteractionHandler;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.animal.GoatEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.sound.EntitySoundInteractionHandler;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
@SoundHandler(entities = {"cow", "goat"}, items = "bucket")
public class MilkEntitySoundInteractionHandler implements EntitySoundInteractionHandler {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/BiomeTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/BiomeTranslator.java
index a61bfc985..7f24dfe94 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/BiomeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/BiomeTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world;
+package org.geysermc.geyser.network.translators.world;
import com.github.steveice10.mc.protocol.data.game.chunk.BitStorage;
import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette;
@@ -35,14 +35,14 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.ints.IntLists;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.chunk.BlockStorage;
-import org.geysermc.connector.network.translators.world.chunk.GeyserChunkSection;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArray;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArrayVersion;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.SingletonBitArray;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.chunk.BlockStorage;
+import org.geysermc.geyser.network.translators.world.chunk.GeyserChunkSection;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArray;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArrayVersion;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.SingletonBitArray;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.MathUtils;
// Array index formula by https://wiki.vg/Chunk_Format
public class BiomeTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/GeyserWorldManager.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/GeyserWorldManager.java
index 52d9c9b4a..41c3e0a55 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/GeyserWorldManager.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/GeyserWorldManager.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world;
+package org.geysermc.geyser.network.translators.world;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
@@ -32,11 +32,11 @@ import com.nukkitx.nbt.NbtMap;
import com.nukkitx.nbt.NbtMapBuilder;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.ChunkCache;
-import org.geysermc.connector.network.translators.inventory.translators.LecternInventoryTranslator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.utils.GameRule;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.ChunkCache;
+import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.utils.GameRule;
public class GeyserWorldManager extends WorldManager {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/WorldManager.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/WorldManager.java
index ca945bfb4..a6fbe94d1 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/WorldManager.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/WorldManager.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world;
+package org.geysermc.geyser.network.translators.world;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.GameRule;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.GameRule;
/**
* Class that manages or retrieves various information
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/BlockStateValues.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/BlockStateValues.java
index a1c47c2b6..486ae745e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/BlockStateValues.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/BlockStateValues.java
@@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block;
+package org.geysermc.geyser.network.translators.world.block;
import com.fasterxml.jackson.databind.JsonNode;
import it.unimi.dsi.fastutil.ints.*;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.geysermc.connector.network.translators.world.block.entity.PistonBlockEntityTranslator;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.type.BlockMapping;
-import org.geysermc.connector.utils.Direction;
-import org.geysermc.connector.utils.PistonBehavior;
-import org.geysermc.connector.utils.collections.FixedInt2ByteMap;
-import org.geysermc.connector.utils.collections.FixedInt2IntMap;
-import org.geysermc.connector.utils.collections.LecternHasBookMap;
+import org.geysermc.geyser.network.translators.world.block.entity.PistonBlockEntityTranslator;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.type.BlockMapping;
+import org.geysermc.geyser.utils.Direction;
+import org.geysermc.geyser.utils.PistonBehavior;
+import org.geysermc.geyser.utils.collections.FixedInt2ByteMap;
+import org.geysermc.geyser.utils.collections.FixedInt2IntMap;
+import org.geysermc.geyser.utils.collections.LecternHasBookMap;
/**
* Used for block entities if the Java block state contains Bedrock block information.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/DoubleChestValue.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/DoubleChestValue.java
index fc998f257..b1e81b92c 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/DoubleChestValue.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/DoubleChestValue.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block;
+package org.geysermc.geyser.network.translators.world.block;
/**
* This stores all values of double chests that are part of the Java block state.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BannerBlockEntityTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BannerBlockEntityTranslator.java
index 107f04fc9..e0911738d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BannerBlockEntityTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.translators.item.translators.BannerTranslator;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.item.translators.BannerTranslator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
@BlockEntity(type = BlockEntityType.BANNER)
public class BannerBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BeaconBlockEntityTranslator.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BeaconBlockEntityTranslator.java
index b2e23c13d..1c0007cc4 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BeaconBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BeaconBlockEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedBlockEntityTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedBlockEntityTranslator.java
index c55f2ceb4..76a2e1726 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedBlockEntityTranslator.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
@BlockEntity(type = BlockEntityType.BED)
public class BedBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedrockOnlyBlockEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedrockOnlyBlockEntity.java
index 5b96dc70d..e1a3ffb45 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedrockOnlyBlockEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BedrockOnlyBlockEntity.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
/**
* Implemented only if a block is a block entity in Bedrock and not Java Edition.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntity.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntity.java
index 2fb50ad10..987f62151 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntityTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntityTranslator.java
index fbc97093d..84d86e36e 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/BlockEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -32,7 +32,7 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.nbt.NbtMap;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.utils.BlockEntityUtils;
+import org.geysermc.geyser.utils.BlockEntityUtils;
/**
* The class that all block entities (on both Java and Bedrock) should translate with
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CampfireBlockEntityTranslator.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CampfireBlockEntityTranslator.java
index a2ecd5d64..255d8a52c 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CampfireBlockEntityTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.nukkitx.nbt.NbtMap;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
@BlockEntity(type = BlockEntityType.CAMPFIRE)
public class CampfireBlockEntityTranslator extends BlockEntityTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java
index 16029dc8d..68d0e76fa 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/CommandBlockBlockEntityTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.*;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
@BlockEntity(type = BlockEntityType.COMMAND_BLOCK)
public class CommandBlockBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java
index ea1dffa4c..43c872a75 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/DoubleChestBlockEntityTranslator.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.world.block.DoubleChestValue;
-import org.geysermc.connector.utils.BlockEntityUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.DoubleChestValue;
+import org.geysermc.geyser.utils.BlockEntityUtils;
/**
* Chests have more block entity properties in Bedrock, which is solved by implementing the BedrockOnlyBlockEntity
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EmptyBlockEntityTranslator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EmptyBlockEntityTranslator.java
index 88edcf7b4..259beb742 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EmptyBlockEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.nbt.NbtMapBuilder;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java
index 6803ead23..310d272a6 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java
index 833542543..b497e6eab 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/FlowerPotBlockEntityTranslator.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.utils.BlockEntityUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.utils.BlockEntityUtils;
public class FlowerPotBlockEntityTranslator implements BedrockOnlyBlockEntity {
/**
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java
index 374e73a4f..b38a370a5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/JigsawBlockBlockEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java
index a0c1033c5..8adea545d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/NoteblockBlockEntityTranslator.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.protocol.bedrock.packet.BlockEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
/**
* Does not implement BlockEntityTranslator because it's only a block entity in Bedrock
@@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.world.block.BlockStateValues;
public class NoteblockBlockEntityTranslator {
public static void translate(GeyserSession session, Position position) {
- int blockState = session.getConnector().getWorldManager().getBlockAt(session, position);
+ int blockState = session.getGeyser().getWorldManager().getBlockAt(session, position);
BlockEventPacket blockEventPacket = new BlockEventPacket();
blockEventPacket.setBlockPosition(Vector3i.from(position.getX(), position.getY(), position.getZ()));
blockEventPacket.setEventType(0);
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntity.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntity.java
index 3cd4b94c0..dca5a6ed9 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntity.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.value.PistonValueType;
import com.nukkitx.math.vector.Vector3d;
@@ -37,14 +37,14 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import lombok.Getter;
import org.geysermc.common.PlatformType;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.PistonCache;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionManager;
-import org.geysermc.connector.network.translators.collision.translators.BlockCollision;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.utils.*;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.PistonCache;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionManager;
+import org.geysermc.geyser.network.translators.collision.translators.BlockCollision;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.utils.*;
import java.util.LinkedList;
import java.util.Map;
@@ -216,10 +216,10 @@ public class PistonBlockEntity {
private void removePistonHead() {
Vector3i blockInFront = position.add(orientation.getUnitVector());
- int blockId = session.getConnector().getWorldManager().getBlockAt(session, blockInFront);
+ int blockId = session.getGeyser().getWorldManager().getBlockAt(session, blockInFront);
if (BlockStateValues.isPistonHead(blockId)) {
ChunkUtils.updateBlock(session, BlockStateValues.JAVA_AIR_ID, blockInFront);
- } else if (session.getConnector().getPlatformType() == PlatformType.SPIGOT && blockId == BlockStateValues.JAVA_AIR_ID) {
+ } else if (session.getGeyser().getPlatformType() == PlatformType.SPIGOT && blockId == BlockStateValues.JAVA_AIR_ID) {
// Spigot removes the piston head from the cache, but we need to send the block update ourselves
ChunkUtils.updateBlock(session, BlockStateValues.JAVA_AIR_ID, blockInFront);
}
@@ -250,7 +250,7 @@ public class PistonBlockEntity {
if (!blocksChecked.add(blockPos)) {
continue;
}
- int blockId = session.getConnector().getWorldManager().getBlockAt(session, blockPos);
+ int blockId = session.getGeyser().getWorldManager().getBlockAt(session, blockPos);
if (blockId == BlockStateValues.JAVA_AIR_ID) {
continue;
}
@@ -273,7 +273,7 @@ public class PistonBlockEntity {
if (action == PistonValueType.PULLING && position.add(directionOffset).equals(adjacentPos)) {
continue;
}
- int adjacentBlockId = session.getConnector().getWorldManager().getBlockAt(session, adjacentPos);
+ int adjacentBlockId = session.getGeyser().getWorldManager().getBlockAt(session, adjacentPos);
if (adjacentBlockId != BlockStateValues.JAVA_AIR_ID && BlockStateValues.isBlockAttached(blockId, adjacentBlockId) && BlockStateValues.canPistonMoveBlock(adjacentBlockId, false)) {
// If it is another slime/honey block we need to check its adjacent blocks
if (BlockStateValues.isBlockSticky(adjacentBlockId)) {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntityTranslator.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntityTranslator.java
index e06a60121..c39112fb2 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/PistonBlockEntityTranslator.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
/**
* Pistons are a special case where they are only a block entity on Bedrock.
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/RequiresBlockState.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/RequiresBlockState.java
index 76fb732b7..b6df97ec2 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/RequiresBlockState.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/RequiresBlockState.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
/**
* Implemented in block entities if their Java block state is required for additional values in Bedrock
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java
index 4fb804ec5..ad2855f0a 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java
@@ -23,19 +23,19 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import javax.annotation.Nullable;
@BlockEntity(type = BlockEntityType.SHULKER_BOX)
public class ShulkerBoxBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
/**
- * Also used in {@link org.geysermc.connector.network.translators.inventory.translators.ShulkerInventoryTranslator}
+ * Also used in {@link org.geysermc.geyser.network.translators.inventory.translators.ShulkerInventoryTranslator}
* where {@code tag} is passed as null.
*/
@Override
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SignBlockEntityTranslator.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SignBlockEntityTranslator.java
index 5057345da..386e16fb8 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SignBlockEntityTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.network.translators.chat.MessageTranslator;
-import org.geysermc.connector.utils.SignUtils;
+import org.geysermc.geyser.network.translators.chat.MessageTranslator;
+import org.geysermc.geyser.utils.SignUtils;
@BlockEntity(type = BlockEntityType.SIGN)
public class SignBlockEntityTranslator extends BlockEntityTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SkullBlockEntityTranslator.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SkullBlockEntityTranslator.java
index 979cb75df..f32fef041 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SkullBlockEntityTranslator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
@@ -34,11 +34,11 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMapBuilder;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.player.SkullPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.skin.SkinProvider;
-import org.geysermc.connector.skin.SkullSkinManager;
+import org.geysermc.geyser.entity.player.SkullPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.skin.SkinProvider;
+import org.geysermc.geyser.skin.SkullSkinManager;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -111,7 +111,7 @@ public class SkullBlockEntityTranslator extends BlockEntityTranslator implements
getProfile(tag).whenComplete((gameProfile, throwable) -> {
if (gameProfile == null) {
- session.getConnector().getLogger().debug("Custom skull with invalid SkullOwner tag: " + blockPosition + " " + tag);
+ session.getGeyser().getLogger().debug("Custom skull with invalid SkullOwner tag: " + blockPosition + " " + tag);
return;
}
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java
index 88cee13b0..017cd03b7 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/block/entity/SpawnerBlockEntityTranslator.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.geyser.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.nbt.NbtMapBuilder;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.registry.Registries;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.registry.Registries;
@BlockEntity(type = BlockEntityType.MOB_SPAWNER)
public class SpawnerBlockEntityTranslator extends BlockEntityTranslator {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/BlockStorage.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/BlockStorage.java
index ae7c25f1d..07f4dbcef 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/BlockStorage.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/BlockStorage.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk;
+package org.geysermc.geyser.network.translators.world.chunk;
import com.nukkitx.network.VarInts;
import io.netty.buffer.ByteBuf;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import lombok.Getter;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArray;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.BitArrayVersion;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArray;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.BitArrayVersion;
import java.util.function.IntConsumer;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunk.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunk.java
index 995c1e600..67257471d 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunk.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunk.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk;
+package org.geysermc.geyser.network.translators.world.chunk;
import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunkSection.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunkSection.java
index d4fab5967..7c0c18804 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/GeyserChunkSection.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/GeyserChunkSection.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk;
+package org.geysermc.geyser.network.translators.world.chunk;
import com.nukkitx.network.util.Preconditions;
import io.netty.buffer.ByteBuf;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/NibbleArray.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/NibbleArray.java
index f028af801..970ae5f79 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/NibbleArray.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/NibbleArray.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk;
+package org.geysermc.geyser.network.translators.world.chunk;
import com.nukkitx.network.util.Preconditions;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArray.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArray.java
index c9621b144..e44d92b20 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArray.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArray.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk.bitarray;
+package org.geysermc.geyser.network.translators.world.chunk.bitarray;
import com.nukkitx.network.VarInts;
import io.netty.buffer.ByteBuf;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArrayVersion.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArrayVersion.java
index d39a1216f..c3cf94aaf 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/BitArrayVersion.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/BitArrayVersion.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk.bitarray;
+package org.geysermc.geyser.network.translators.world.chunk.bitarray;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.utils.MathUtils;
public enum BitArrayVersion {
V16(16, 2, null),
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/PaddedBitArray.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/PaddedBitArray.java
index b770d0dc7..9b2c43ee5 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/PaddedBitArray.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/PaddedBitArray.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk.bitarray;
+package org.geysermc.geyser.network.translators.world.chunk.bitarray;
import com.nukkitx.network.util.Preconditions;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.utils.MathUtils;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/Pow2BitArray.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/Pow2BitArray.java
index 1a784b7f9..5ad65b5aa 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/Pow2BitArray.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/Pow2BitArray.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk.bitarray;
+package org.geysermc.geyser.network.translators.world.chunk.bitarray;
import com.nukkitx.network.util.Preconditions;
-import org.geysermc.connector.utils.MathUtils;
+import org.geysermc.geyser.utils.MathUtils;
import java.util.Arrays;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/SingletonBitArray.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/SingletonBitArray.java
index db4e05301..13482307f 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/chunk/bitarray/SingletonBitArray.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/chunk/bitarray/SingletonBitArray.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.chunk.bitarray;
+package org.geysermc.geyser.network.translators.world.chunk.bitarray;
import io.netty.buffer.ByteBuf;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/LevelEventTransformer.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/event/LevelEventTransformer.java
index 31d62e825..2949bfad4 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/event/LevelEventTransformer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/LevelEventTransformer.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.event;
+package org.geysermc.geyser.network.translators.world.event;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
/**
* Represents an event capable of translating itself into bedrock
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/PlaySoundEventTransformer.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/event/PlaySoundEventTransformer.java
index e3a0e6a68..194b62948 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/event/PlaySoundEventTransformer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/PlaySoundEventTransformer.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.event;
+package org.geysermc.geyser.network.translators.world.event;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundEventEventTransformer.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundEventEventTransformer.java
index a9998d518..425e28c9b 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundEventEventTransformer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundEventEventTransformer.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.event;
+package org.geysermc.geyser.network.translators.world.event;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public record SoundEventEventTransformer(SoundEvent soundEvent,
String identifier, int extraData) implements LevelEventTransformer {
diff --git a/core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundLevelEventTransformer.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java
rename to core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundLevelEventTransformer.java
index 26bcfbeae..f15d2a7ad 100644
--- a/core/src/main/java/org/geysermc/connector/network/translators/world/event/SoundLevelEventTransformer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/translators/world/event/SoundLevelEventTransformer.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.world.event;
+package org.geysermc.geyser.network.translators.world.event;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public record SoundLevelEventTransformer(LevelEventType levelEventType,
int data) implements LevelEventTransformer {
diff --git a/core/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java b/core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java
similarity index 75%
rename from core/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java
rename to core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java
index 9cbbf5c4f..88671b66f 100644
--- a/core/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java
+++ b/core/src/main/java/org/geysermc/geyser/ping/GeyserLegacyPingPassthrough.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.ping;
+package org.geysermc.geyser.ping;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.nukkitx.nbt.util.VarInts;
-import org.geysermc.connector.common.ping.GeyserPingInfo;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.MinecraftProtocol;
+import org.geysermc.geyser.common.ping.GeyserPingInfo;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.MinecraftProtocol;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -43,26 +43,26 @@ import java.net.SocketTimeoutException;
import java.util.concurrent.TimeUnit;
public class GeyserLegacyPingPassthrough implements IGeyserPingPassthrough, Runnable {
- private final GeyserConnector connector;
+ private final GeyserImpl geyser;
- public GeyserLegacyPingPassthrough(GeyserConnector connector) {
- this.connector = connector;
+ public GeyserLegacyPingPassthrough(GeyserImpl geyser) {
+ this.geyser = geyser;
}
private GeyserPingInfo pingInfo;
/**
* Start legacy ping passthrough thread
- * @param connector GeyserConnector
+ * @param geyser Geyser
* @return GeyserPingPassthrough, or null if not initialized
*/
- public static IGeyserPingPassthrough init(GeyserConnector connector) {
- if (connector.getConfig().isPassthroughMotd() || connector.getConfig().isPassthroughPlayerCounts()) {
- GeyserLegacyPingPassthrough pingPassthrough = new GeyserLegacyPingPassthrough(connector);
+ public static IGeyserPingPassthrough init(GeyserImpl geyser) {
+ if (geyser.getConfig().isPassthroughMotd() || geyser.getConfig().isPassthroughPlayerCounts()) {
+ GeyserLegacyPingPassthrough pingPassthrough = new GeyserLegacyPingPassthrough(geyser);
// Ensure delay is not zero
- int interval = (connector.getConfig().getPingPassthroughInterval() == 0) ? 1 : connector.getConfig().getPingPassthroughInterval();
- connector.getLogger().debug("Scheduling ping passthrough at an interval of " + interval + " second(s).");
- connector.getScheduledThread().scheduleAtFixedRate(pingPassthrough, 1, interval, TimeUnit.SECONDS);
+ int interval = (geyser.getConfig().getPingPassthroughInterval() == 0) ? 1 : geyser.getConfig().getPingPassthroughInterval();
+ geyser.getLogger().debug("Scheduling ping passthrough at an interval of " + interval + " second(s).");
+ geyser.getScheduledThread().scheduleAtFixedRate(pingPassthrough, 1, interval, TimeUnit.SECONDS);
return pingPassthrough;
}
return null;
@@ -77,8 +77,8 @@ public class GeyserLegacyPingPassthrough implements IGeyserPingPassthrough, Runn
public void run() {
try {
Socket socket = new Socket();
- String address = connector.getConfig().getRemote().getAddress();
- int port = connector.getConfig().getRemote().getPort();
+ String address = geyser.getConfig().getRemote().getAddress();
+ int port = geyser.getConfig().getRemote().getPort();
socket.connect(new InetSocketAddress(address, port), 5000);
ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
@@ -109,7 +109,7 @@ public class GeyserLegacyPingPassthrough implements IGeyserPingPassthrough, Runn
VarInts.readUnsignedInt(dataInputStream);
String json = new String(buffer);
- this.pingInfo = GeyserConnector.JSON_MAPPER.readValue(json, GeyserPingInfo.class);
+ this.pingInfo = GeyserImpl.JSON_MAPPER.readValue(json, GeyserPingInfo.class);
byteArrayStream.close();
handshake.close();
@@ -118,9 +118,9 @@ public class GeyserLegacyPingPassthrough implements IGeyserPingPassthrough, Runn
socket.close();
} catch (SocketTimeoutException | ConnectException ex) {
this.pingInfo = null;
- this.connector.getLogger().debug("Connection timeout for ping passthrough.");
+ this.geyser.getLogger().debug("Connection timeout for ping passthrough.");
} catch (JsonParseException | JsonMappingException ex) {
- this.connector.getLogger().error("Failed to parse json when pinging server!", ex);
+ this.geyser.getLogger().error("Failed to parse json when pinging server!", ex);
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/core/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java b/core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java
rename to core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java
index 2ca0ea9c5..5a2eb04ae 100644
--- a/core/src/main/java/org/geysermc/connector/ping/IGeyserPingPassthrough.java
+++ b/core/src/main/java/org/geysermc/geyser/ping/IGeyserPingPassthrough.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.ping;
+package org.geysermc.geyser.ping;
-import org.geysermc.connector.common.ping.GeyserPingInfo;
+import org.geysermc.geyser.common.ping.GeyserPingInfo;
import java.net.Inet4Address;
import java.net.InetSocketAddress;
diff --git a/core/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java
rename to core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java
index c5c7cf87f..390d3b2aa 100644
--- a/core/src/main/java/org/geysermc/connector/registry/AbstractMappedRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/AbstractMappedRegistry.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import javax.annotation.Nullable;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/ArrayRegistry.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java
rename to core/src/main/java/org/geysermc/geyser/registry/ArrayRegistry.java
index bb97ddb12..5ef0aeba0 100644
--- a/core/src/main/java/org/geysermc/connector/registry/ArrayRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/ArrayRegistry.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import javax.annotation.Nullable;
import java.util.function.Supplier;
diff --git a/core/src/main/java/org/geysermc/connector/registry/BlockRegistries.java b/core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/registry/BlockRegistries.java
rename to core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java
index 191b45952..c80eb739b 100644
--- a/core/src/main/java/org/geysermc/connector/registry/BlockRegistries.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java
@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.geysermc.connector.registry.loader.RegistryLoaders;
-import org.geysermc.connector.registry.populator.BlockRegistryPopulator;
-import org.geysermc.connector.registry.type.BlockMapping;
-import org.geysermc.connector.registry.type.BlockMappings;
-import org.geysermc.connector.utils.collections.Object2IntBiMap;
+import org.geysermc.geyser.registry.loader.RegistryLoaders;
+import org.geysermc.geyser.registry.populator.BlockRegistryPopulator;
+import org.geysermc.geyser.registry.type.BlockMapping;
+import org.geysermc.geyser.registry.type.BlockMappings;
+import org.geysermc.geyser.utils.collections.Object2IntBiMap;
/**
* Holds all the block registries in Geyser.
diff --git a/core/src/main/java/org/geysermc/connector/registry/MappedRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/MappedRegistry.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/MappedRegistry.java
rename to core/src/main/java/org/geysermc/geyser/registry/MappedRegistry.java
index 523024ab3..9860eda78 100644
--- a/core/src/main/java/org/geysermc/connector/registry/MappedRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/MappedRegistry.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import java.util.Map;
import java.util.function.Supplier;
diff --git a/core/src/main/java/org/geysermc/connector/registry/Registries.java b/core/src/main/java/org/geysermc/geyser/registry/Registries.java
similarity index 84%
rename from core/src/main/java/org/geysermc/connector/registry/Registries.java
rename to core/src/main/java/org/geysermc/geyser/registry/Registries.java
index 15fbeb03f..ef73e28e9 100644
--- a/core/src/main/java/org/geysermc/connector/registry/Registries.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/Registries.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
@@ -39,20 +39,20 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.geysermc.connector.entity.EntityDefinition;
-import org.geysermc.connector.network.translators.collision.translators.BlockCollision;
-import org.geysermc.connector.network.translators.item.Enchantment.JavaEnchantment;
-import org.geysermc.connector.network.translators.sound.SoundHandler;
-import org.geysermc.connector.network.translators.sound.SoundInteractionHandler;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
-import org.geysermc.connector.network.translators.world.event.LevelEventTransformer;
-import org.geysermc.connector.registry.loader.*;
-import org.geysermc.connector.registry.populator.ItemRegistryPopulator;
-import org.geysermc.connector.registry.populator.RecipeRegistryPopulator;
-import org.geysermc.connector.registry.type.EnchantmentData;
-import org.geysermc.connector.registry.type.ItemMappings;
-import org.geysermc.connector.registry.type.ParticleMapping;
-import org.geysermc.connector.registry.type.SoundMapping;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.network.translators.collision.translators.BlockCollision;
+import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment;
+import org.geysermc.geyser.network.translators.sound.SoundHandler;
+import org.geysermc.geyser.network.translators.sound.SoundInteractionHandler;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator;
+import org.geysermc.geyser.network.translators.world.event.LevelEventTransformer;
+import org.geysermc.geyser.registry.loader.*;
+import org.geysermc.geyser.registry.populator.ItemRegistryPopulator;
+import org.geysermc.geyser.registry.populator.RecipeRegistryPopulator;
+import org.geysermc.geyser.registry.type.EnchantmentData;
+import org.geysermc.geyser.registry.type.ItemMappings;
+import org.geysermc.geyser.registry.type.ParticleMapping;
+import org.geysermc.geyser.registry.type.SoundMapping;
import java.util.EnumMap;
import java.util.List;
@@ -81,12 +81,12 @@ public class Registries {
/**
* A mapped registry which stores a block entity identifier to its {@link BlockEntityTranslator}.
*/
- public static final SimpleMappedRegistry BLOCK_ENTITIES = SimpleMappedRegistry.create("org.geysermc.connector.network.translators.world.block.entity.BlockEntity", BlockEntityRegistryLoader::new);
+ public static final SimpleMappedRegistry BLOCK_ENTITIES = SimpleMappedRegistry.create("org.geysermc.geyser.network.translators.world.block.entity.BlockEntity", BlockEntityRegistryLoader::new);
/**
* A mapped registry containing which holds block IDs to its {@link BlockCollision}.
*/
- public static final SimpleMappedRegistry COLLISIONS = SimpleMappedRegistry.create(Pair.of("org.geysermc.connector.network.translators.collision.translators.Translator", "mappings/collision.json"), CollisionRegistryLoader::new);
+ public static final SimpleMappedRegistry COLLISIONS = SimpleMappedRegistry.create(Pair.of("org.geysermc.geyser.network.translators.collision.translators.Translator", "mappings/collision.json"), CollisionRegistryLoader::new);
/**
* A versioned registry which holds a {@link RecipeType} to a corresponding list of {@link CraftingData}.
@@ -149,7 +149,7 @@ public class Registries {
/**
* A mapped registry holding {@link SoundHandler}s to their corresponding {@link SoundInteractionHandler}.
*/
- public static final SimpleMappedRegistry> SOUND_HANDLERS = SimpleMappedRegistry.create("org.geysermc.connector.network.translators.sound.SoundHandler", SoundHandlerRegistryLoader::new);
+ public static final SimpleMappedRegistry> SOUND_HANDLERS = SimpleMappedRegistry.create("org.geysermc.geyser.network.translators.sound.SoundHandler", SoundHandlerRegistryLoader::new);
public static void init() {
// no-op
diff --git a/core/src/main/java/org/geysermc/connector/registry/Registry.java b/core/src/main/java/org/geysermc/geyser/registry/Registry.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/registry/Registry.java
rename to core/src/main/java/org/geysermc/geyser/registry/Registry.java
index dfa0e3397..15a18e3b1 100644
--- a/core/src/main/java/org/geysermc/connector/registry/Registry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/Registry.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import java.util.function.Consumer;
@@ -59,7 +59,7 @@ import java.util.function.Consumer;
* though, the first parameter would be a location of some sort, such as a file path
* where the loader will load the mappings from. The NBT registry is a good reference
* point for something both simple and practical. See {@link Registries#BIOMES_NBT} and
- * {@link org.geysermc.connector.registry.loader.NbtRegistryLoader}.
+ * {@link org.geysermc.geyser.registry.loader.NbtRegistryLoader}.
*
* @param the value being held by the registry
*/
diff --git a/core/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/SimpleMappedRegistry.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java
rename to core/src/main/java/org/geysermc/geyser/registry/SimpleMappedRegistry.java
index 938450014..9eddab92f 100644
--- a/core/src/main/java/org/geysermc/connector/registry/SimpleMappedRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/SimpleMappedRegistry.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import java.util.Map;
import java.util.function.Supplier;
diff --git a/core/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/SimpleRegistry.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java
rename to core/src/main/java/org/geysermc/geyser/registry/SimpleRegistry.java
index 16bf24f79..b39aae450 100644
--- a/core/src/main/java/org/geysermc/connector/registry/SimpleRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/SimpleRegistry.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import java.util.function.Supplier;
diff --git a/core/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java
rename to core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java
index 91b969df3..797c2ea48 100644
--- a/core/src/main/java/org/geysermc/connector/registry/VersionedRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry;
+package org.geysermc.geyser.registry;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import org.geysermc.connector.registry.loader.RegistryLoader;
+import org.geysermc.geyser.registry.loader.RegistryLoader;
import java.util.Map;
import java.util.function.Supplier;
diff --git a/core/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java
rename to core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java
index 98e84a5c2..1f42d7fb0 100644
--- a/core/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/AnnotatedRegistryLoader.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.loader;
+package org.geysermc.geyser.registry.loader;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.geyser.utils.FileUtils;
import java.lang.annotation.Annotation;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java
rename to core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java
index c38e3efa9..5af552469 100644
--- a/core/src/main/java/org/geysermc/connector/registry/loader/BiomeIdentifierRegistryLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/BiomeIdentifierRegistryLoader.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.loader;
+package org.geysermc.geyser.registry.loader;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.utils.FileUtils;
import java.io.IOException;
import java.io.InputStream;
@@ -49,7 +49,7 @@ public class BiomeIdentifierRegistryLoader implements RegistryLoader biomeEntries;
try (InputStream stream = FileUtils.getResource("mappings/biomes.json")) {
- biomeEntries = GeyserConnector.JSON_MAPPER.readValue(stream, biomeEntriesType);
+ biomeEntries = GeyserImpl.JSON_MAPPER.readValue(stream, biomeEntriesType);
} catch (IOException e) {
throw new AssertionError("Unable to load Bedrock runtime biomes", e);
}
diff --git a/core/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java
rename to core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java
index 5e9d156a1..fd0f72a84 100644
--- a/core/src/main/java/org/geysermc/connector/registry/loader/BlockEntityRegistryLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/BlockEntityRegistryLoader.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.loader;
+package org.geysermc.geyser.registry.loader;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntity;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
-import org.geysermc.connector.network.translators.world.block.entity.EmptyBlockEntityTranslator;
-import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntity;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator;
+import org.geysermc.geyser.network.translators.world.block.entity.EmptyBlockEntityTranslator;
+import org.geysermc.geyser.utils.FileUtils;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
diff --git a/core/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java
rename to core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java
index 49ccfd831..bf3877ff6 100644
--- a/core/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/CollisionRegistryLoader.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.loader;
+package org.geysermc.geyser.registry.loader;
import com.fasterxml.jackson.databind.node.ArrayNode;
import it.unimi.dsi.fastutil.Pair;
@@ -32,15 +32,15 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import lombok.AllArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.translators.collision.BoundingBox;
-import org.geysermc.connector.network.translators.collision.CollisionRemapper;
-import org.geysermc.connector.network.translators.collision.translators.BlockCollision;
-import org.geysermc.connector.network.translators.collision.translators.OtherCollision;
-import org.geysermc.connector.network.translators.collision.translators.SolidCollision;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.type.BlockMapping;
-import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.translators.collision.BoundingBox;
+import org.geysermc.geyser.network.translators.collision.CollisionRemapper;
+import org.geysermc.geyser.network.translators.collision.translators.BlockCollision;
+import org.geysermc.geyser.network.translators.collision.translators.OtherCollision;
+import org.geysermc.geyser.network.translators.collision.translators.SolidCollision;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.type.BlockMapping;
+import org.geysermc.geyser.utils.FileUtils;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
@@ -58,7 +58,7 @@ public class CollisionRegistryLoader extends MultiResourceRegistryLoader, CollisionInfo> annotationMap = new IdentityHashMap<>();
for (Class clazz : FileUtils.getGeneratedClassesForAnnotation(CollisionRemapper.class.getName())) {
- GeyserConnector.getInstance().getLogger().debug("Found annotated collision translator: " + clazz.getCanonicalName());
+ GeyserImpl.getInstance().getLogger().debug("Found annotated collision translator: " + clazz.getCanonicalName());
CollisionRemapper collisionRemapper = clazz.getAnnotation(CollisionRemapper.class);
annotationMap.put(clazz, new CollisionInfo(collisionRemapper, Pattern.compile(collisionRemapper.regex()), Pattern.compile(collisionRemapper.paramRegex())));
@@ -69,7 +69,7 @@ public class CollisionRegistryLoader extends MultiResourceRegistryLoader collisionList;
try {
- ArrayNode collisionNode = (ArrayNode) GeyserConnector.JSON_MAPPER.readTree(stream);
+ ArrayNode collisionNode = (ArrayNode) GeyserImpl.JSON_MAPPER.readTree(stream);
collisionList = loadBoundingBoxes(collisionNode);
} catch (Exception e) {
throw new AssertionError("Unable to load collision data", e);
diff --git a/core/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java
similarity index 90%
rename from core/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java
rename to core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java
index 0dc5345d1..1da42a68d 100644
--- a/core/src/main/java/org/geysermc/connector/registry/loader/EffectRegistryLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/EffectRegistryLoader.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.loader;
+package org.geysermc.geyser.registry.loader;
import com.fasterxml.jackson.databind.JsonNode;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.utils.FileUtils;
import java.io.InputStream;
import java.util.Map;
@@ -46,7 +46,7 @@ public abstract class EffectRegistryLoader implements RegistryLoader items;
try {
- items = GeyserConnector.JSON_MAPPER.readValue(stream, mappingItemsType);
+ items = GeyserImpl.JSON_MAPPER.readValue(stream, mappingItemsType);
} catch (Exception e) {
throw new AssertionError("Unable to load Java runtime item IDs", e);
}
@@ -93,7 +93,7 @@ public class ItemRegistryPopulator {
List itemEntries;
try {
- itemEntries = GeyserConnector.JSON_MAPPER.readValue(stream, paletteEntriesType);
+ itemEntries = GeyserImpl.JSON_MAPPER.readValue(stream, paletteEntriesType);
} catch (Exception e) {
throw new AssertionError("Unable to load Bedrock runtime item IDs", e);
}
@@ -114,7 +114,7 @@ public class ItemRegistryPopulator {
JsonNode creativeItemEntries;
try {
- creativeItemEntries = GeyserConnector.JSON_MAPPER.readTree(stream).get("items");
+ creativeItemEntries = GeyserImpl.JSON_MAPPER.readTree(stream).get("items");
} catch (Exception e) {
throw new AssertionError("Unable to load creative items", e);
}
@@ -201,7 +201,7 @@ public class ItemRegistryPopulator {
int itemIndex = 0;
int javaFurnaceMinecartId = 0;
- boolean usingFurnaceMinecart = GeyserConnector.getInstance().getConfig().isAddNonBedrockItems();
+ boolean usingFurnaceMinecart = GeyserImpl.getInstance().getConfig().isAddNonBedrockItems();
Set javaOnlyItems = new ObjectOpenHashSet<>();
Collections.addAll(javaOnlyItems, "minecraft:spectral_arrow", "minecraft:debug_stick",
@@ -383,7 +383,7 @@ public class ItemRegistryPopulator {
if (javaOnlyItems.contains(javaIdentifier)) {
// These items don't exist on Bedrock, so set up a variable that indicates they should have custom names
mappingBuilder = mappingBuilder.translationString((bedrockBlockId != -1 ? "block." : "item.") + entry.getKey().replace(":", "."));
- GeyserConnector.getInstance().getLogger().debug("Adding " + entry.getKey() + " as an item that needs to be translated.");
+ GeyserImpl.getInstance().getLogger().debug("Adding " + entry.getKey() + " as an item that needs to be translated.");
}
ItemMapping mapping = mappingBuilder.build();
diff --git a/core/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java
rename to core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java
index dca743824..bd124e28f 100644
--- a/core/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/RecipeRegistryPopulator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.populator;
+package org.geysermc.geyser.registry.populator;
import com.fasterxml.jackson.databind.JsonNode;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@@ -39,20 +39,20 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.translators.item.ItemTranslator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
-import org.geysermc.connector.registry.type.ItemMappings;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.translators.item.ItemTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
+import org.geysermc.geyser.registry.type.ItemMappings;
+import org.geysermc.geyser.utils.FileUtils;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-import static org.geysermc.connector.utils.InventoryUtils.LAST_RECIPE_NET_ID;
+import static org.geysermc.geyser.utils.InventoryUtils.LAST_RECIPE_NET_ID;
/**
* Populates the recipe registry.
@@ -64,7 +64,7 @@ public class RecipeRegistryPopulator {
JsonNode items;
try {
- items = GeyserConnector.JSON_MAPPER.readTree(stream);
+ items = GeyserImpl.JSON_MAPPER.readTree(stream);
} catch (Exception e) {
throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.toolbox.fail.runtime_java"), e);
}
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java
index f9a074e91..cad2d12f5 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/BlockMapping.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import lombok.Builder;
import lombok.Value;
-import org.geysermc.connector.utils.BlockUtils;
-import org.geysermc.connector.utils.PistonBehavior;
+import org.geysermc.geyser.utils.BlockUtils;
+import org.geysermc.geyser.utils.PistonBehavior;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java b/core/src/main/java/org/geysermc/geyser/registry/type/BlockMappings.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/BlockMappings.java
index 8e1cd6a1a..0d85b80e0 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/BlockMappings.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/BlockMappings.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import com.nukkitx.nbt.NbtList;
import com.nukkitx.nbt.NbtMap;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java b/core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java
index cd16a093a..0c0e7df1d 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/EnchantmentData.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/EnchantmentData.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import it.unimi.dsi.fastutil.ints.IntSet;
-import org.geysermc.connector.network.translators.item.Enchantment.JavaEnchantment;
+import org.geysermc.geyser.network.translators.item.Enchantment.JavaEnchantment;
import java.util.Set;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java b/core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java
index 12e5544b7..56d7825cc 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
index 1a7714968..178ebd607 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/ItemMapping.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Value;
-import org.geysermc.connector.network.MinecraftProtocol;
-import org.geysermc.connector.registry.BlockRegistries;
+import org.geysermc.geyser.network.MinecraftProtocol;
+import org.geysermc.geyser.registry.BlockRegistries;
import java.util.Set;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java
index bffe415a1..f0eb1747b 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/ItemMappings.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.nukkitx.protocol.bedrock.data.inventory.ComponentItemData;
@@ -33,8 +33,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.IntList;
import lombok.Builder;
import lombok.Value;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.translators.item.StoredItemMappings;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.translators.item.StoredItemMappings;
import javax.annotation.Nullable;
import java.util.List;
@@ -136,7 +136,7 @@ public class ItemMappings {
// This will hide the message when the player clicks with an empty hand
if (data.getId() != 0 && data.getDamage() != 0) {
- GeyserConnector.getInstance().getLogger().debug("Missing mapping for bedrock item " + data.getId() + ":" + data.getDamage());
+ GeyserImpl.getInstance().getLogger().debug("Missing mapping for bedrock item " + data.getId() + ":" + data.getDamage());
}
return ItemMapping.AIR;
}
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java b/core/src/main/java/org/geysermc/geyser/registry/type/PaletteItem.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/PaletteItem.java
index 4582d1e80..c7815c055 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/PaletteItem.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/PaletteItem.java
@@ -24,7 +24,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import lombok.Data;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java
index fa7fcb300..17590d7fc 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/ParticleMapping.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/ParticleMapping.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
diff --git a/core/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/SoundMapping.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java
rename to core/src/main/java/org/geysermc/geyser/registry/type/SoundMapping.java
index ba0bcd862..d6aaf9bd0 100644
--- a/core/src/main/java/org/geysermc/connector/registry/type/SoundMapping.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/SoundMapping.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.registry.type;
+package org.geysermc.geyser.registry.type;
import lombok.Value;
diff --git a/core/src/main/java/org/geysermc/connector/scoreboard/Objective.java b/core/src/main/java/org/geysermc/geyser/scoreboard/Objective.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/scoreboard/Objective.java
rename to core/src/main/java/org/geysermc/geyser/scoreboard/Objective.java
index 5a7748f79..31407b77d 100644
--- a/core/src/main/java/org/geysermc/connector/scoreboard/Objective.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/Objective.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.scoreboard;
+package org.geysermc.geyser.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor;
diff --git a/core/src/main/java/org/geysermc/connector/scoreboard/Score.java b/core/src/main/java/org/geysermc/geyser/scoreboard/Score.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/scoreboard/Score.java
rename to core/src/main/java/org/geysermc/geyser/scoreboard/Score.java
index 10abfa29a..fe8674d1a 100644
--- a/core/src/main/java/org/geysermc/connector/scoreboard/Score.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/Score.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.scoreboard;
+package org.geysermc.geyser.scoreboard;
import com.nukkitx.protocol.bedrock.data.ScoreInfo;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java b/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java
rename to core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
index 7d0cdea7d..41b46aedf 100644
--- a/core/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.scoreboard;
+package org.geysermc.geyser.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
import com.nukkitx.protocol.bedrock.data.ScoreInfo;
@@ -31,19 +31,19 @@ import com.nukkitx.protocol.bedrock.packet.RemoveObjectivePacket;
import com.nukkitx.protocol.bedrock.packet.SetDisplayObjectivePacket;
import com.nukkitx.protocol.bedrock.packet.SetScorePacket;
import lombok.Getter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import javax.annotation.Nullable;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import static org.geysermc.connector.scoreboard.UpdateType.*;
+import static org.geysermc.geyser.scoreboard.UpdateType.*;
public final class Scoreboard {
private final GeyserSession session;
@@ -61,7 +61,7 @@ public final class Scoreboard {
public Scoreboard(GeyserSession session) {
this.session = session;
- this.logger = GeyserConnector.getInstance().getLogger();
+ this.logger = GeyserImpl.getInstance().getLogger();
}
public void removeScoreboard() {
diff --git a/core/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java b/core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java
similarity index 89%
rename from core/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java
rename to core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java
index 2204fd976..9c732046c 100644
--- a/core/src/main/java/org/geysermc/connector/scoreboard/ScoreboardUpdater.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/ScoreboardUpdater.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.scoreboard;
+package org.geysermc.geyser.scoreboard;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.WorldCache;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.WorldCache;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicInteger;
@@ -46,12 +46,12 @@ public final class ScoreboardUpdater extends Thread {
private static final boolean DEBUG_ENABLED;
static {
- GeyserConfiguration config = GeyserConnector.getInstance().getConfig();
+ GeyserConfiguration config = GeyserImpl.getInstance().getConfig();
FIRST_SCORE_PACKETS_PER_SECOND_THRESHOLD = Math.min(config.getScoreboardPacketThreshold(), SECOND_SCORE_PACKETS_PER_SECOND_THRESHOLD);
DEBUG_ENABLED = config.isDebugMode();
}
- private final GeyserConnector connector = GeyserConnector.getInstance();
+ private final GeyserImpl geyser = GeyserImpl.getInstance();
private long lastUpdate = System.currentTimeMillis();
private long lastPacketsPerSecondUpdate = System.currentTimeMillis();
@@ -62,7 +62,7 @@ public final class ScoreboardUpdater extends Thread {
@Override
public void run() {
- while (!connector.isShuttingDown()) {
+ while (!geyser.isShuttingDown()) {
try {
long timeTillAction = getTimeTillNextAction();
if (timeTillAction > 0) {
@@ -73,7 +73,7 @@ public final class ScoreboardUpdater extends Thread {
long currentTime = System.currentTimeMillis();
// reset score-packets per second every second
- Collection sessions = connector.getSessionManager().getSessions().values();
+ Collection sessions = geyser.getSessionManager().getSessions().values();
if (currentTime - lastPacketsPerSecondUpdate >= 1000) {
lastPacketsPerSecondUpdate = currentTime;
for (GeyserSession session : sessions) {
@@ -117,7 +117,7 @@ public final class ScoreboardUpdater extends Thread {
SECOND_SCORE_PACKETS_PER_SECOND_THRESHOLD :
FIRST_SCORE_PACKETS_PER_SECOND_THRESHOLD;
- connector.getLogger().info(
+ geyser.getLogger().info(
LanguageUtils.getLocaleStringLog("geyser.scoreboard.updater.threshold_reached.log", session.getName(), threshold, pps) +
LanguageUtils.getLocaleStringLog("geyser.scoreboard.updater.threshold_reached", (millisBetweenUpdates / 1000.0))
);
@@ -132,7 +132,7 @@ public final class ScoreboardUpdater extends Thread {
if (DEBUG_ENABLED) {
long timeSpent = System.currentTimeMillis() - currentTime;
if (timeSpent > 0) {
- connector.getLogger().info(String.format(
+ geyser.getLogger().info(String.format(
"Scoreboard updater: took %s ms. Updated %s players",
timeSpent, sessions.size()
));
@@ -142,7 +142,7 @@ public final class ScoreboardUpdater extends Thread {
long timeTillNextAction = getTimeTillNextAction();
sleepFor(timeTillNextAction);
} catch (Throwable e) {
- connector.getLogger().error("Error while translating scoreboard information!", e);
+ geyser.getLogger().error("Error while translating scoreboard information!", e);
// Wait so we don't try to run the scoreboard immediately after this
sleepFor(FIRST_MILLIS_BETWEEN_UPDATES);
}
diff --git a/core/src/main/java/org/geysermc/connector/scoreboard/Team.java b/core/src/main/java/org/geysermc/geyser/scoreboard/Team.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/scoreboard/Team.java
rename to core/src/main/java/org/geysermc/geyser/scoreboard/Team.java
index 78457fba1..b2fb44d34 100644
--- a/core/src/main/java/org/geysermc/connector/scoreboard/Team.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/Team.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.scoreboard;
+package org.geysermc.geyser.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.NameTagVisibility;
import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor;
diff --git a/core/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java b/core/src/main/java/org/geysermc/geyser/scoreboard/UpdateType.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java
rename to core/src/main/java/org/geysermc/geyser/scoreboard/UpdateType.java
index 5e645cd1b..3366b08f8 100644
--- a/core/src/main/java/org/geysermc/connector/scoreboard/UpdateType.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/UpdateType.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.scoreboard;
+package org.geysermc.geyser.scoreboard;
public enum UpdateType {
REMOVE,
diff --git a/core/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java b/core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java
rename to core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java
index 9dce59acc..f9106319f 100644
--- a/core/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java
@@ -23,18 +23,18 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.skin;
+package org.geysermc.geyser.skin;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Getter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.Constants;
-import org.geysermc.connector.utils.PluginMessageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.Constants;
+import org.geysermc.geyser.utils.PluginMessageUtils;
import org.geysermc.floodgate.util.WebsocketEventType;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
@@ -48,7 +48,7 @@ import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
-import static org.geysermc.connector.utils.PluginMessageUtils.getSkinChannel;
+import static org.geysermc.geyser.utils.PluginMessageUtils.getSkinChannel;
public final class FloodgateSkinUploader {
private final ObjectMapper JACKSON = new ObjectMapper();
@@ -62,8 +62,8 @@ public final class FloodgateSkinUploader {
@Getter private String verifyCode;
@Getter private int subscribersCount;
- public FloodgateSkinUploader(GeyserConnector connector) {
- this.logger = connector.getLogger();
+ public FloodgateSkinUploader(GeyserImpl geyser) {
+ this.logger = geyser.getLogger();
this.client = new WebSocketClient(Constants.GLOBAL_API_WS_URI) {
@Override
public void onOpen(ServerHandshake handshake) {
@@ -111,7 +111,7 @@ public final class FloodgateSkinUploader {
}
String xuid = node.get("xuid").asText();
- GeyserSession session = connector.getPlayerByXuid(xuid);
+ GeyserSession session = geyser.getPlayerByXuid(xuid);
if (session != null) {
if (!node.get("success").asBoolean()) {
@@ -169,7 +169,7 @@ public final class FloodgateSkinUploader {
}
}
// try to reconnect (which will make a new id and verify token) after a few seconds
- reconnectLater(connector);
+ reconnectLater(geyser);
}
@Override
@@ -210,16 +210,16 @@ public final class FloodgateSkinUploader {
skinQueue.add(jsonString);
}
- private void reconnectLater(GeyserConnector connector) {
+ private void reconnectLater(GeyserImpl geyser) {
// we ca only reconnect when the thread pool is open
- if (connector.getScheduledThread().isShutdown() || closed) {
+ if (geyser.getScheduledThread().isShutdown() || closed) {
logger.info("The skin uploader has been closed");
return;
}
long additionalTime = ThreadLocalRandom.current().nextInt(7);
// we don't have to check the result. onClose will handle that for us
- connector.getScheduledThread()
+ geyser.getScheduledThread()
.schedule(client::reconnect, 8 + additionalTime, TimeUnit.SECONDS);
}
diff --git a/core/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java b/core/src/main/java/org/geysermc/geyser/skin/ProvidedSkin.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java
rename to core/src/main/java/org/geysermc/geyser/skin/ProvidedSkin.java
index 36b7d2d39..e7b08ad3f 100644
--- a/core/src/main/java/org/geysermc/connector/skin/ProvidedSkin.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/ProvidedSkin.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.skin;
+package org.geysermc.geyser.skin;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/skin/SkinManager.java b/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
similarity index 86%
rename from core/src/main/java/org/geysermc/connector/skin/SkinManager.java
rename to core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
index 6815d7550..eeb4a5138 100644
--- a/core/src/main/java/org/geysermc/connector/skin/SkinManager.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
@@ -23,19 +23,19 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.skin;
+package org.geysermc.geyser.skin;
import com.fasterxml.jackson.databind.JsonNode;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.nukkitx.protocol.bedrock.data.skin.ImageData;
import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin;
import com.nukkitx.protocol.bedrock.packet.PlayerListPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.auth.BedrockClientData;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.common.AuthType;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.auth.BedrockClientData;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
@@ -86,10 +86,10 @@ public class SkinManager {
// This attempts to find the XUID of the player so profile images show up for Xbox accounts
String xuid = "";
- GeyserSession playerSession = GeyserConnector.getInstance().getPlayerByUuid(uuid);
+ GeyserSession playerSession = GeyserImpl.getInstance().getPlayerByUuid(uuid);
if (playerSession != null) {
- xuid = playerSession.getAuthData().getXboxUUID();
+ xuid = playerSession.getAuthData().getXuid();
}
PlayerListPacket.Entry entry;
@@ -97,7 +97,7 @@ public class SkinManager {
// If we are building a PlayerListEntry for our own session we use our AuthData UUID instead of the Java UUID
// as Bedrock expects to get back its own provided UUID
if (session.getPlayerEntity().getUuid().equals(uuid)) {
- entry = new PlayerListPacket.Entry(session.getAuthData().getUUID());
+ entry = new PlayerListPacket.Entry(session.getAuthData().getUuid());
} else {
entry = new PlayerListPacket.Entry(uuid);
}
@@ -192,7 +192,7 @@ public class SkinManager {
session.sendUpstreamPacket(playerRemovePacket);
}
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e);
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e);
}
if (skinAndCapeConsumer != null) {
@@ -202,9 +202,9 @@ public class SkinManager {
}
public static void handleBedrockSkin(PlayerEntity playerEntity, BedrockClientData clientData) {
- GeyserConnector connector = GeyserConnector.getInstance();
- if (connector.getConfig().isDebugMode()) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.register", playerEntity.getUsername(), playerEntity.getUuid()));
+ GeyserImpl geyser = GeyserImpl.getInstance();
+ if (geyser.getConfig().isDebugMode()) {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.register", playerEntity.getUsername(), playerEntity.getUuid()));
}
try {
@@ -217,9 +217,9 @@ public class SkinManager {
if (skinBytes.length <= (128 * 128 * 4) && !clientData.isPersonaSkin()) {
SkinProvider.storeBedrockSkin(playerEntity.getUuid(), clientData.getSkinId(), skinBytes);
SkinProvider.storeBedrockGeometry(playerEntity.getUuid(), geometryNameBytes, geometryBytes);
- } else if (connector.getConfig().isDebugMode()) {
- connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.fail", playerEntity.getUsername()));
- connector.getLogger().debug("The size of '" + playerEntity.getUsername() + "' skin is: " + clientData.getSkinImageWidth() + "x" + clientData.getSkinImageHeight());
+ } else if (geyser.getConfig().isDebugMode()) {
+ geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.fail", playerEntity.getUsername()));
+ geyser.getLogger().debug("The size of '" + playerEntity.getUsername() + "' skin is: " + clientData.getSkinImageWidth() + "x" + clientData.getSkinImageHeight());
}
if (!clientData.getCapeId().equals("")) {
@@ -245,7 +245,7 @@ public class SkinManager {
// Likely offline mode
return loadBedrockOrOfflineSkin(profile);
}
- JsonNode skinObject = GeyserConnector.JSON_MAPPER.readTree(new String(Base64.getDecoder().decode(skinProperty.getValue()), StandardCharsets.UTF_8));
+ JsonNode skinObject = GeyserImpl.JSON_MAPPER.readTree(new String(Base64.getDecoder().decode(skinProperty.getValue()), StandardCharsets.UTF_8));
JsonNode textures = skinObject.get("textures");
JsonNode skinTexture = textures.get("SKIN");
@@ -261,8 +261,8 @@ public class SkinManager {
return new GameProfileData(skinUrl, capeUrl, isAlex);
} catch (Exception exception) {
- GeyserConnector.getInstance().getLogger().debug("Something went wrong while processing skin for " + profile.getName());
- if (GeyserConnector.getInstance().getConfig().isDebugMode()) {
+ GeyserImpl.getInstance().getLogger().debug("Something went wrong while processing skin for " + profile.getName());
+ if (GeyserImpl.getInstance().getConfig().isDebugMode()) {
exception.printStackTrace();
}
return loadBedrockOrOfflineSkin(profile);
@@ -279,8 +279,8 @@ public class SkinManager {
String skinUrl = isAlex ? SkinProvider.EMPTY_SKIN_ALEX.getTextureUrl() : SkinProvider.EMPTY_SKIN.getTextureUrl();
String capeUrl = SkinProvider.EMPTY_CAPE.getTextureUrl();
- if (("steve".equals(skinUrl) || "alex".equals(skinUrl)) && GeyserConnector.getInstance().getConfig().getRemote().getAuthType() != AuthType.ONLINE) {
- GeyserSession session = GeyserConnector.getInstance().getPlayerByUuid(profile.getId());
+ if (("steve".equals(skinUrl) || "alex".equals(skinUrl)) && GeyserImpl.getInstance().getConfig().getRemote().getAuthType() != AuthType.ONLINE) {
+ GeyserSession session = GeyserImpl.getInstance().getPlayerByUuid(profile.getId());
if (session != null) {
skinUrl = session.getClientData().getSkinId();
diff --git a/core/src/main/java/org/geysermc/connector/skin/SkinProvider.java b/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/skin/SkinProvider.java
rename to core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
index 7e25fed6f..edb3ad36e 100644
--- a/core/src/main/java/org/geysermc/connector/skin/SkinProvider.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.skin;
+package org.geysermc.geyser.skin;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,10 +36,10 @@ import com.google.common.cache.CacheBuilder;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.connector.utils.WebUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.FileUtils;
+import org.geysermc.geyser.utils.WebUtils;
import javax.imageio.ImageIO;
import java.awt.*;
@@ -56,7 +56,7 @@ import java.util.*;
import java.util.concurrent.*;
public class SkinProvider {
- public static final boolean ALLOW_THIRD_PARTY_CAPES = GeyserConnector.getInstance().getConfig().isAllowThirdPartyCapes();
+ public static final boolean ALLOW_THIRD_PARTY_CAPES = GeyserImpl.getInstance().getConfig().isAllowThirdPartyCapes();
private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(ALLOW_THIRD_PARTY_CAPES ? 21 : 14);
public static final byte[] STEVE_SKIN = new ProvidedSkin("bedrock/skin/skin_steve.png").getSkin();
@@ -81,7 +81,7 @@ public class SkinProvider {
private static final Map cachedGeometry = new ConcurrentHashMap<>();
- public static final boolean ALLOW_THIRD_PARTY_EARS = GeyserConnector.getInstance().getConfig().isAllowThirdPartyEars();
+ public static final boolean ALLOW_THIRD_PARTY_EARS = GeyserImpl.getInstance().getConfig().isAllowThirdPartyEars();
public static final String EARS_GEOMETRY;
public static final String EARS_GEOMETRY_SLIM;
public static final SkinGeometry SKULL_GEOMETRY;
@@ -100,15 +100,15 @@ public class SkinProvider {
SKULL_GEOMETRY = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.customskull\"}}", skullData, false);
// Schedule Daily Image Expiry if we are caching them
- if (GeyserConnector.getInstance().getConfig().getCacheImages() > 0) {
- GeyserConnector.getInstance().getScheduledThread().scheduleAtFixedRate(() -> {
- File cacheFolder = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("images").toFile();
+ if (GeyserImpl.getInstance().getConfig().getCacheImages() > 0) {
+ GeyserImpl.getInstance().getScheduledThread().scheduleAtFixedRate(() -> {
+ File cacheFolder = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("images").toFile();
if (!cacheFolder.exists()) {
return;
}
int count = 0;
- final long expireTime = ((long)GeyserConnector.getInstance().getConfig().getCacheImages()) * ((long)1000 * 60 * 60 * 24);
+ final long expireTime = ((long) GeyserImpl.getInstance().getConfig().getCacheImages()) * ((long)1000 * 60 * 60 * 24);
for (File imageFile : Objects.requireNonNull(cacheFolder.listFiles())) {
if (imageFile.lastModified() < System.currentTimeMillis() - expireTime) {
//noinspection ResultOfMethodCallIgnored
@@ -118,7 +118,7 @@ public class SkinProvider {
}
if (count > 0) {
- GeyserConnector.getInstance().getLogger().debug(String.format("Removed %d cached image files as they have expired", count));
+ GeyserImpl.getInstance().getLogger().debug(String.format("Removed %d cached image files as they have expired", count));
}
}, 10, 1440, TimeUnit.MINUTES);
}
@@ -143,7 +143,7 @@ public class SkinProvider {
String newSkinUrl = skinUrl;
if ("steve".equals(skinUrl) || "alex".equals(skinUrl)) {
- GeyserSession session = GeyserConnector.getInstance().getPlayerByUuid(playerId);
+ GeyserSession session = GeyserImpl.getInstance().getPlayerByUuid(playerId);
if (session != null) {
newSkinUrl = session.getClientData().getSkinId();
@@ -156,7 +156,7 @@ public class SkinProvider {
getOrDefault(requestCape(capeUrl, provider, false), EMPTY_CAPE, 5)
);
- GeyserConnector.getInstance().getLogger().debug("Took " + (System.currentTimeMillis() - time) + "ms for " + playerId);
+ GeyserImpl.getInstance().getLogger().debug("Took " + (System.currentTimeMillis() - time) + "ms for " + playerId);
return skinAndCape;
}, EXECUTOR_SERVICE);
}
@@ -388,10 +388,10 @@ public class SkinProvider {
BufferedImage image = null;
// First see if we have a cached file. We also update the modification stamp so we know when the file was last used
- File imageFile = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("images").resolve(UUID.nameUUIDFromBytes(imageUrl.getBytes()).toString() + ".png").toFile();
+ File imageFile = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("images").resolve(UUID.nameUUIDFromBytes(imageUrl.getBytes()).toString() + ".png").toFile();
if (imageFile.exists()) {
try {
- GeyserConnector.getInstance().getLogger().debug("Reading cached image from file " + imageFile.getPath() + " for " + imageUrl);
+ GeyserImpl.getInstance().getLogger().debug("Reading cached image from file " + imageFile.getPath() + " for " + imageUrl);
imageFile.setLastModified(System.currentTimeMillis());
image = ImageIO.read(imageFile);
} catch (IOException ignored) {}
@@ -400,16 +400,16 @@ public class SkinProvider {
// If no image we download it
if (image == null) {
image = downloadImage(imageUrl, provider);
- GeyserConnector.getInstance().getLogger().debug("Downloaded " + imageUrl);
+ GeyserImpl.getInstance().getLogger().debug("Downloaded " + imageUrl);
// Write to cache if we are allowed
- if (GeyserConnector.getInstance().getConfig().getCacheImages() > 0) {
+ if (GeyserImpl.getInstance().getConfig().getCacheImages() > 0) {
imageFile.getParentFile().mkdirs();
try {
ImageIO.write(image, "png", imageFile);
- GeyserConnector.getInstance().getLogger().debug("Writing cached skin to file " + imageFile.getPath() + " for " + imageUrl);
+ GeyserImpl.getInstance().getLogger().debug("Writing cached skin to file " + imageFile.getPath() + " for " + imageUrl);
} catch (IOException e) {
- GeyserConnector.getInstance().getLogger().error("Failed to write cached skin to file " + imageFile.getPath() + " for " + imageUrl);
+ GeyserImpl.getInstance().getLogger().error("Failed to write cached skin to file " + imageFile.getPath() + " for " + imageUrl);
}
}
}
@@ -477,7 +477,7 @@ public class SkinProvider {
node = WebUtils.getJson("https://api.mojang.com/users/profiles/minecraft/" + skullOwner.get("Name").getValue());
JsonNode id = node.get("id");
if (id == null) {
- GeyserConnector.getInstance().getLogger().debug("No UUID found in Mojang response for " + skullOwner.get("Name").getValue());
+ GeyserImpl.getInstance().getLogger().debug("No UUID found in Mojang response for " + skullOwner.get("Name").getValue());
return null;
}
uuidToString = id.asText();
@@ -488,14 +488,14 @@ public class SkinProvider {
List profileProperties = new ArrayList<>();
JsonNode properties = node.get("properties");
if (properties == null) {
- GeyserConnector.getInstance().getLogger().debug("No properties found in Mojang response for " + uuidToString);
+ GeyserImpl.getInstance().getLogger().debug("No properties found in Mojang response for " + uuidToString);
return null;
}
profileProperties.add(new GameProfile.Property("textures", node.get("properties").get(0).get("value").asText()));
gameProfile.setProperties(profileProperties);
return gameProfile;
} catch (Exception e) {
- if (GeyserConnector.getInstance().getConfig().isDebugMode()) {
+ if (GeyserImpl.getInstance().getConfig().isDebugMode()) {
e.printStackTrace();
}
return null;
@@ -508,7 +508,7 @@ public class SkinProvider {
return readFiveZigCape(imageUrl);
HttpURLConnection con = (HttpURLConnection) new URL(imageUrl).openConnection();
- con.setRequestProperty("User-Agent", "Geyser-" + GeyserConnector.getInstance().getPlatformType().toString() + "/" + GeyserConnector.VERSION);
+ con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION);
BufferedImage image = ImageIO.read(con.getInputStream());
if (image == null) throw new NullPointerException();
diff --git a/core/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java b/core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java
rename to core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java
index ca02afdbe..ae16aee05 100644
--- a/core/src/main/java/org/geysermc/connector/skin/SkullSkinManager.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/SkullSkinManager.java
@@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.skin;
+package org.geysermc.geyser.skin;
import com.nukkitx.protocol.bedrock.data.skin.ImageData;
import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin;
import com.nukkitx.protocol.bedrock.packet.PlayerSkinPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.entity.player.PlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.entity.player.PlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.utils.LanguageUtils;
import java.util.Collections;
import java.util.function.Consumer;
@@ -63,7 +63,7 @@ public class SkullSkinManager extends SkinManager {
packet.setTrustedSkin(true);
session.sendUpstreamPacket(packet);
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e);
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.skin.fail", entity.getUuid()), e);
}
if (skinConsumer != null) {
diff --git a/core/src/main/java/org/geysermc/connector/utils/AttributeUtils.java b/core/src/main/java/org/geysermc/geyser/utils/AttributeUtils.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/AttributeUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/AttributeUtils.java
index 5e26950c5..f83d87c52 100644
--- a/core/src/main/java/org/geysermc/connector/utils/AttributeUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/AttributeUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute;
import com.github.steveice10.mc.protocol.data.game.entity.attribute.AttributeModifier;
diff --git a/core/src/main/java/org/geysermc/connector/utils/Axis.java b/core/src/main/java/org/geysermc/geyser/utils/Axis.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/utils/Axis.java
rename to core/src/main/java/org/geysermc/geyser/utils/Axis.java
index 1075f8d2c..7465d6a4d 100644
--- a/core/src/main/java/org/geysermc/connector/utils/Axis.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/Axis.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.nukkitx.math.vector.Vector3d;
diff --git a/core/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java b/core/src/main/java/org/geysermc/geyser/utils/BedrockMapIcon.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java
rename to core/src/main/java/org/geysermc/geyser/utils/BedrockMapIcon.java
index 8b9a5dca3..cac901c0d 100644
--- a/core/src/main/java/org/geysermc/connector/utils/BedrockMapIcon.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/BedrockMapIcon.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.level.map.MapIconType;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java b/core/src/main/java/org/geysermc/geyser/utils/BlockEntityUtils.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/BlockEntityUtils.java
index 38ffa80f5..78c9860f5 100644
--- a/core/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/BlockEntityUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
@@ -31,11 +31,11 @@ import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.entity.BedrockOnlyBlockEntity;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
-import org.geysermc.connector.network.translators.world.block.entity.FlowerPotBlockEntityTranslator;
-import org.geysermc.connector.registry.Registries;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.entity.BedrockOnlyBlockEntity;
+import org.geysermc.geyser.network.translators.world.block.entity.BlockEntityTranslator;
+import org.geysermc.geyser.network.translators.world.block.entity.FlowerPotBlockEntityTranslator;
+import org.geysermc.geyser.registry.Registries;
import javax.annotation.Nonnull;
import java.util.HashMap;
diff --git a/core/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java b/core/src/main/java/org/geysermc/geyser/utils/BlockPositionIterator.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java
rename to core/src/main/java/org/geysermc/geyser/utils/BlockPositionIterator.java
index c7ef28c82..81ad49b66 100644
--- a/core/src/main/java/org/geysermc/connector/utils/BlockPositionIterator.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/BlockPositionIterator.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.nukkitx.network.util.Preconditions;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/utils/BlockUtils.java b/core/src/main/java/org/geysermc/geyser/utils/BlockUtils.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/utils/BlockUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/BlockUtils.java
index 140577104..fc66abd05 100644
--- a/core/src/main/java/org/geysermc/connector/utils/BlockUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/BlockUtils.java
@@ -23,19 +23,19 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.math.vector.Vector3i;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.collision.translators.BlockCollision;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.BlockMapping;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.collision.translators.BlockCollision;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.BlockMapping;
+import org.geysermc.geyser.registry.type.ItemMapping;
public class BlockUtils {
/**
@@ -58,7 +58,7 @@ public class BlockUtils {
case "sword":
return blockMapping.getJavaBlockId() == BlockStateValues.JAVA_COBWEB_ID;
default:
- session.getConnector().getLogger().warning("Unknown tool type: " + itemToolType);
+ session.getGeyser().getLogger().warning("Unknown tool type: " + itemToolType);
return false;
}
}
@@ -235,10 +235,10 @@ public class BlockUtils {
}
public static BlockCollision getCollisionAt(GeyserSession session, Vector3i blockPos) {
- return getCollision(session.getConnector().getWorldManager().getBlockAt(session, blockPos));
+ return getCollision(session.getGeyser().getWorldManager().getBlockAt(session, blockPos));
}
public static BlockCollision getCollisionAt(GeyserSession session, int x, int y, int z) {
- return getCollision(session.getConnector().getWorldManager().getBlockAt(session, x, y, z));
+ return getCollision(session.getGeyser().getWorldManager().getBlockAt(session, x, y, z));
}
}
diff --git a/core/src/main/java/org/geysermc/connector/utils/ChunkUtils.java b/core/src/main/java/org/geysermc/geyser/utils/ChunkUtils.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/ChunkUtils.java
index 8015df8b7..650faccc1 100644
--- a/core/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/ChunkUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -38,17 +38,17 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import it.unimi.dsi.fastutil.ints.IntLists;
import lombok.experimental.UtilityClass;
-import org.geysermc.connector.entity.ItemFrameEntity;
-import org.geysermc.connector.entity.player.SkullPlayerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-import org.geysermc.connector.network.translators.world.block.entity.BedrockOnlyBlockEntity;
-import org.geysermc.connector.network.translators.world.chunk.BlockStorage;
-import org.geysermc.connector.network.translators.world.chunk.GeyserChunkSection;
-import org.geysermc.connector.network.translators.world.chunk.bitarray.SingletonBitArray;
-import org.geysermc.connector.registry.BlockRegistries;
+import org.geysermc.geyser.entity.ItemFrameEntity;
+import org.geysermc.geyser.entity.player.SkullPlayerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
+import org.geysermc.geyser.network.translators.world.block.entity.BedrockOnlyBlockEntity;
+import org.geysermc.geyser.network.translators.world.chunk.BlockStorage;
+import org.geysermc.geyser.network.translators.world.chunk.GeyserChunkSection;
+import org.geysermc.geyser.network.translators.world.chunk.bitarray.SingletonBitArray;
+import org.geysermc.geyser.registry.BlockRegistries;
-import static org.geysermc.connector.network.translators.world.block.BlockStateValues.JAVA_AIR_ID;
+import static org.geysermc.geyser.network.translators.world.block.BlockStateValues.JAVA_AIR_ID;
@UtilityClass
public class ChunkUtils {
@@ -253,7 +253,7 @@ public class ChunkUtils {
// The constraints change depending on if the player is in the overworld or not, and if experimental height is enabled
if (minY < (extendedHeight ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT)
|| maxY > (extendedHeight ? MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD : MAXIMUM_ACCEPTED_HEIGHT)) {
- session.getConnector().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.translator.chunk.out_of_bounds",
+ session.getGeyser().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.translator.chunk.out_of_bounds",
extendedHeight ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT,
extendedHeight ? MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD : MAXIMUM_ACCEPTED_HEIGHT,
session.getDimension()));
diff --git a/core/src/main/java/org/geysermc/connector/utils/Constants.java b/core/src/main/java/org/geysermc/geyser/utils/Constants.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/Constants.java
rename to core/src/main/java/org/geysermc/geyser/utils/Constants.java
index 58125d909..fb918590d 100644
--- a/core/src/main/java/org/geysermc/connector/utils/Constants.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/Constants.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/core/src/main/java/org/geysermc/connector/utils/CooldownUtils.java b/core/src/main/java/org/geysermc/geyser/utils/CooldownUtils.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/utils/CooldownUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/CooldownUtils.java
index 4b2704803..8f72fafd8 100644
--- a/core/src/main/java/org/geysermc/connector/utils/CooldownUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/CooldownUtils.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.nukkitx.protocol.bedrock.packet.SetTitlePacket;
import lombok.Getter;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.PreferencesCache;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.cache.PreferencesCache;
import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/geysermc/connector/utils/DimensionUtils.java b/core/src/main/java/org/geysermc/geyser/utils/DimensionUtils.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/DimensionUtils.java
index b56e26246..974fdb2c7 100644
--- a/core/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/DimensionUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.Effect;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -32,9 +32,9 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.ChangeDimensionPacket;
import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
import com.nukkitx.protocol.bedrock.packet.StopSoundPacket;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.util.Set;
@@ -127,13 +127,13 @@ public class DimensionUtils {
*/
public static String getNewDimension(CompoundTag dimensionTag) {
if (dimensionTag == null || dimensionTag.isEmpty()) {
- GeyserConnector.getInstance().getLogger().debug("Dimension tag was null or empty.");
+ GeyserImpl.getInstance().getLogger().debug("Dimension tag was null or empty.");
return OVERWORLD;
}
if (dimensionTag.getValue().get("effects") != null) {
return ((StringTag) dimensionTag.getValue().get("effects")).getValue();
}
- GeyserConnector.getInstance().getLogger().debug("Effects portion of the tag was null or empty.");
+ GeyserImpl.getInstance().getLogger().debug("Effects portion of the tag was null or empty.");
return OVERWORLD;
}
diff --git a/core/src/main/java/org/geysermc/connector/utils/Direction.java b/core/src/main/java/org/geysermc/geyser/utils/Direction.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/Direction.java
rename to core/src/main/java/org/geysermc/geyser/utils/Direction.java
index 5a6bea349..c02d19196 100644
--- a/core/src/main/java/org/geysermc/connector/utils/Direction.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/Direction.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.level.block.value.PistonValue;
import com.nukkitx.math.vector.Vector3i;
diff --git a/core/src/main/java/org/geysermc/connector/utils/DockerCheck.java b/core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/DockerCheck.java
rename to core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java
index 31c37edf2..accf5bf6d 100644
--- a/core/src/main/java/org/geysermc/connector/utils/DockerCheck.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/DockerCheck.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import java.nio.file.Files;
import java.nio.file.Paths;
diff --git a/core/src/main/java/org/geysermc/connector/utils/EffectUtils.java b/core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java
similarity index 91%
rename from core/src/main/java/org/geysermc/connector/utils/EffectUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java
index 7016cc786..c738a2654 100644
--- a/core/src/main/java/org/geysermc/connector/utils/EffectUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/EffectUtils.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.level.particle.ParticleType;
import com.nukkitx.protocol.bedrock.data.LevelEventType;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ParticleMapping;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ParticleMapping;
import javax.annotation.Nonnull;
diff --git a/core/src/main/java/org/geysermc/connector/utils/EntityUtils.java b/core/src/main/java/org/geysermc/geyser/utils/EntityUtils.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/utils/EntityUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/EntityUtils.java
index f0de018ff..96a94a966 100644
--- a/core/src/main/java/org/geysermc/connector/utils/EntityUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/EntityUtils.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.Effect;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.EntityDefinitions;
-import org.geysermc.connector.entity.living.ArmorStandEntity;
-import org.geysermc.connector.entity.living.animal.AnimalEntity;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.EntityDefinitions;
+import org.geysermc.geyser.entity.living.ArmorStandEntity;
+import org.geysermc.geyser.entity.living.animal.AnimalEntity;
import java.util.Locale;
diff --git a/core/src/main/java/org/geysermc/connector/utils/FileUtils.java b/core/src/main/java/org/geysermc/geyser/utils/FileUtils.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/utils/FileUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/FileUtils.java
index 00f24472b..7d8029848 100644
--- a/core/src/main/java/org/geysermc/connector/utils/FileUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/FileUtils.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.geyser.GeyserImpl;
import java.io.*;
import java.lang.annotation.Annotation;
@@ -65,7 +65,7 @@ public class FileUtils {
public static T loadJson(InputStream src, Class valueType) throws IOException {
// Read specifically with UTF-8 to allow any non-UTF-encoded JSON to read
- return GeyserConnector.JSON_MAPPER.readValue(new InputStreamReader(src, StandardCharsets.UTF_8), valueType);
+ return GeyserImpl.JSON_MAPPER.readValue(new InputStreamReader(src, StandardCharsets.UTF_8), valueType);
}
/**
@@ -94,7 +94,7 @@ public class FileUtils {
//noinspection ResultOfMethodCallIgnored
file.createNewFile();
try (FileOutputStream fos = new FileOutputStream(file)) {
- try (InputStream input = GeyserConnector.class.getResourceAsStream("/" + name)) { // resources need leading "/" prefix
+ try (InputStream input = GeyserImpl.class.getResourceAsStream("/" + name)) { // resources need leading "/" prefix
byte[] bytes = new byte[input.available()];
//noinspection ResultOfMethodCallIgnored
@@ -271,7 +271,7 @@ public class FileUtils {
try {
return Class.forName(className);
} catch (ClassNotFoundException ex) {
- GeyserConnector.getInstance().getLogger().error("Failed to find class " + className, ex);
+ GeyserImpl.getInstance().getLogger().error("Failed to find class " + className, ex);
throw new RuntimeException(ex);
}
}).collect(Collectors.toSet());
diff --git a/core/src/main/java/org/geysermc/connector/utils/FireworkColor.java b/core/src/main/java/org/geysermc/geyser/utils/FireworkColor.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/utils/FireworkColor.java
rename to core/src/main/java/org/geysermc/geyser/utils/FireworkColor.java
index 5a4f0ae0b..a95b727b6 100644
--- a/core/src/main/java/org/geysermc/connector/utils/FireworkColor.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/FireworkColor.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.util.HSVLike;
diff --git a/core/src/main/java/org/geysermc/connector/utils/GameRule.java b/core/src/main/java/org/geysermc/geyser/utils/GameRule.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/utils/GameRule.java
rename to core/src/main/java/org/geysermc/geyser/utils/GameRule.java
index 0b3908694..7b95f192c 100644
--- a/core/src/main/java/org/geysermc/connector/utils/GameRule.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/GameRule.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import lombok.Getter;
diff --git a/core/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java b/core/src/main/java/org/geysermc/geyser/utils/GeyserAdvancement.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java
rename to core/src/main/java/org/geysermc/geyser/utils/GeyserAdvancement.java
index 31560498a..78b17af34 100644
--- a/core/src/main/java/org/geysermc/connector/utils/GeyserAdvancement.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/GeyserAdvancement.java
@@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.advancement.Advancement;
import lombok.NonNull;
-import org.geysermc.connector.network.session.cache.AdvancementsCache;
+import org.geysermc.geyser.network.session.cache.AdvancementsCache;
import java.util.List;
diff --git a/core/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java b/core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java
similarity index 95%
rename from core/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java
rename to core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java
index c43b19b92..026564939 100644
--- a/core/src/main/java/org/geysermc/connector/utils/InteractiveTagManager.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java
@@ -23,21 +23,21 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import lombok.Getter;
-import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.living.MobEntity;
-import org.geysermc.connector.entity.living.animal.AnimalEntity;
-import org.geysermc.connector.entity.living.animal.horse.HorseEntity;
-import org.geysermc.connector.entity.living.animal.tameable.CatEntity;
-import org.geysermc.connector.entity.living.animal.tameable.WolfEntity;
-import org.geysermc.connector.entity.living.merchant.VillagerEntity;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.entity.Entity;
+import org.geysermc.geyser.entity.living.MobEntity;
+import org.geysermc.geyser.entity.living.animal.AnimalEntity;
+import org.geysermc.geyser.entity.living.animal.horse.HorseEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.CatEntity;
+import org.geysermc.geyser.entity.living.animal.tameable.WolfEntity;
+import org.geysermc.geyser.entity.living.merchant.VillagerEntity;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.EnumSet;
import java.util.Set;
diff --git a/core/src/main/java/org/geysermc/connector/utils/InventoryUtils.java b/core/src/main/java/org/geysermc/geyser/utils/InventoryUtils.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/InventoryUtils.java
index c046865f8..89b5657f6 100644
--- a/core/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/InventoryUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
@@ -37,17 +37,17 @@ import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
import com.nukkitx.protocol.bedrock.packet.PlayerHotbarPacket;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.inventory.Container;
-import org.geysermc.connector.inventory.GeyserItemStack;
-import org.geysermc.connector.inventory.Inventory;
-import org.geysermc.connector.inventory.PlayerInventory;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.LecternInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.translators.chest.DoubleChestInventoryTranslator;
-import org.geysermc.connector.registry.Registries;
-import org.geysermc.connector.registry.type.ItemMapping;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.inventory.Container;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.inventory.Inventory;
+import org.geysermc.geyser.inventory.PlayerInventory;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.InventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator;
+import org.geysermc.geyser.network.translators.inventory.translators.chest.DoubleChestInventoryTranslator;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.Collections;
import java.util.Objects;
@@ -293,7 +293,7 @@ public class InventoryUtils {
}
session.sendDownstreamPacket(actionPacket);
} else {
- session.getConnector().getLogger().debug("Cannot find item for block " + itemName);
+ session.getGeyser().getLogger().debug("Cannot find item for block " + itemName);
}
}
}
diff --git a/core/src/main/java/org/geysermc/connector/utils/ItemUtils.java b/core/src/main/java/org/geysermc/geyser/utils/ItemUtils.java
similarity index 96%
rename from core/src/main/java/org/geysermc/connector/utils/ItemUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/ItemUtils.java
index 8bd2edfd1..c24c40ecf 100644
--- a/core/src/main/java/org/geysermc/connector/utils/ItemUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/ItemUtils.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.opennbt.tag.builtin.*;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.GeyserSession;
public class ItemUtils {
diff --git a/core/src/main/java/org/geysermc/connector/utils/LanguageUtils.java b/core/src/main/java/org/geysermc/geyser/utils/LanguageUtils.java
similarity index 82%
rename from core/src/main/java/org/geysermc/connector/utils/LanguageUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/LanguageUtils.java
index 340a5e58c..7d1719d18 100644
--- a/core/src/main/java/org/geysermc/connector/utils/LanguageUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/LanguageUtils.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.geyser.GeyserImpl;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -64,7 +64,7 @@ public class LanguageUtils {
return;
}
- InputStream localeStream = GeyserConnector.class.getClassLoader().getResourceAsStream("languages/texts/" + locale + ".properties");
+ InputStream localeStream = GeyserImpl.class.getClassLoader().getResourceAsStream("languages/texts/" + locale + ".properties");
// Load the locale
if (localeStream != null) {
@@ -78,8 +78,8 @@ public class LanguageUtils {
// Insert the locale into the mappings
LOCALE_MAPPINGS.put(locale, localeProp);
} else {
- if (GeyserConnector.getInstance() != null && GeyserConnector.getInstance().getLogger() != null) {
- GeyserConnector.getInstance().getLogger().warning("Missing locale: " + locale);
+ if (GeyserImpl.getInstance() != null && GeyserImpl.getInstance().getLogger() != null) {
+ GeyserImpl.getInstance().getLogger().warning("Missing locale: " + locale);
}
}
}
@@ -168,10 +168,10 @@ public class LanguageUtils {
String locale;
boolean isValid = true;
- if (GeyserConnector.getInstance() != null &&
- GeyserConnector.getInstance().getConfig() != null &&
- GeyserConnector.getInstance().getConfig().getDefaultLocale() != null) { // If the config option for getDefaultLocale does not equal null, use that
- locale = formatLocale(GeyserConnector.getInstance().getConfig().getDefaultLocale());
+ if (GeyserImpl.getInstance() != null &&
+ GeyserImpl.getInstance().getConfig() != null &&
+ GeyserImpl.getInstance().getConfig().getDefaultLocale() != null) { // If the config option for getDefaultLocale does not equal null, use that
+ locale = formatLocale(GeyserImpl.getInstance().getConfig().getDefaultLocale());
if (isValidLanguage(locale)) {
CACHED_LOCALE = locale;
return locale;
@@ -184,8 +184,8 @@ public class LanguageUtils {
locale = "en_US";
loadGeyserLocale(locale);
}
- if (GeyserConnector.getInstance() != null &&
- GeyserConnector.getInstance().getConfig() != null && (GeyserConnector.getInstance().getConfig().getDefaultLocale() == null || !isValid)) { // Means we should use the system locale for sure
+ if (GeyserImpl.getInstance() != null &&
+ GeyserImpl.getInstance().getConfig() != null && (GeyserImpl.getInstance().getConfig().getDefaultLocale() == null || !isValid)) { // Means we should use the system locale for sure
CACHED_LOCALE = locale;
}
return locale;
@@ -200,11 +200,11 @@ public class LanguageUtils {
boolean result = true;
if (FileUtils.class.getResource("/languages/texts/" + locale + ".properties") == null) {
result = false;
- if (GeyserConnector.getInstance() != null && GeyserConnector.getInstance().getLogger() != null) { // Could be too early for these to be initialized
+ if (GeyserImpl.getInstance() != null && GeyserImpl.getInstance().getLogger() != null) { // Could be too early for these to be initialized
if (locale.equals("en_US")) {
- GeyserConnector.getInstance().getLogger().error("English locale not found in Geyser. Did you clone the submodules? (git submodule update --init)");
+ GeyserImpl.getInstance().getLogger().error("English locale not found in Geyser. Did you clone the submodules? (git submodule update --init)");
} else {
- GeyserConnector.getInstance().getLogger().warning(locale + " is not a valid Bedrock language."); // We can't translate this since we just loaded an invalid language
+ GeyserImpl.getInstance().getLogger().warning(locale + " is not a valid Bedrock language."); // We can't translate this since we just loaded an invalid language
}
}
} else {
diff --git a/core/src/main/java/org/geysermc/connector/utils/LocaleUtils.java b/core/src/main/java/org/geysermc/geyser/utils/LocaleUtils.java
similarity index 79%
rename from core/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/LocaleUtils.java
index 623c4ba84..b22315f9f 100644
--- a/core/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/LocaleUtils.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.Getter;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.MinecraftProtocol;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.MinecraftProtocol;
import java.io.*;
import java.nio.file.Files;
@@ -49,7 +49,7 @@ public class LocaleUtils {
static {
// Create the locales folder
- File localesFolder = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales").toFile();
+ File localesFolder = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("locales").toFile();
//noinspection ResultOfMethodCallIgnored
localesFolder.mkdir();
@@ -64,7 +64,7 @@ public class LocaleUtils {
return CompletableFuture.supplyAsync(() -> {
try {
// Get the version manifest from Mojang
- VersionManifest versionManifest = GeyserConnector.JSON_MAPPER.readValue(WebUtils.getBody("https://launchermeta.mojang.com/mc/game/version_manifest.json"), VersionManifest.class);
+ VersionManifest versionManifest = GeyserImpl.JSON_MAPPER.readValue(WebUtils.getBody("https://launchermeta.mojang.com/mc/game/version_manifest.json"), VersionManifest.class);
// Get the url for the latest version of the games manifest
String latestInfoURL = "";
@@ -81,15 +81,15 @@ public class LocaleUtils {
}
// Get the individual version manifest
- VersionInfo versionInfo = GeyserConnector.JSON_MAPPER.readValue(WebUtils.getBody(latestInfoURL), VersionInfo.class);
+ VersionInfo versionInfo = GeyserImpl.JSON_MAPPER.readValue(WebUtils.getBody(latestInfoURL), VersionInfo.class);
// Get the client jar for use when downloading the en_us locale
- GeyserConnector.getInstance().getLogger().debug(GeyserConnector.JSON_MAPPER.writeValueAsString(versionInfo.getDownloads()));
+ GeyserImpl.getInstance().getLogger().debug(GeyserImpl.JSON_MAPPER.writeValueAsString(versionInfo.getDownloads()));
clientJarInfo = versionInfo.getDownloads().get("client");
- GeyserConnector.getInstance().getLogger().debug(GeyserConnector.JSON_MAPPER.writeValueAsString(clientJarInfo));
+ GeyserImpl.getInstance().getLogger().debug(GeyserImpl.JSON_MAPPER.writeValueAsString(clientJarInfo));
// Get the assets list
- JsonNode assets = GeyserConnector.JSON_MAPPER.readTree(WebUtils.getBody(versionInfo.getAssetIndex().getUrl())).get("objects");
+ JsonNode assets = GeyserImpl.JSON_MAPPER.readTree(WebUtils.getBody(versionInfo.getAssetIndex().getUrl())).get("objects");
// Put each asset into an array for use later
Iterator> assetIterator = assets.fields();
@@ -100,11 +100,11 @@ public class LocaleUtils {
continue;
}
- Asset asset = GeyserConnector.JSON_MAPPER.treeToValue(entry.getValue(), Asset.class);
+ Asset asset = GeyserImpl.JSON_MAPPER.treeToValue(entry.getValue(), Asset.class);
ASSET_MAP.put(entry.getKey(), asset);
}
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace())));
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace())));
}
return null;
});
@@ -124,11 +124,11 @@ public class LocaleUtils {
// Check the locale isn't already loaded
if (!ASSET_MAP.containsKey("minecraft/lang/" + locale + ".json") && !locale.equals("en_us")) {
- GeyserConnector.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.invalid", locale));
+ GeyserImpl.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.invalid", locale));
return;
}
- GeyserConnector.getInstance().getLogger().debug("Downloading and loading locale: " + locale);
+ GeyserImpl.getInstance().getLogger().debug("Downloading and loading locale: " + locale);
downloadLocale(locale);
loadLocale(locale);
@@ -140,7 +140,7 @@ public class LocaleUtils {
* @param locale Locale to download
*/
private static void downloadLocale(String locale) {
- File localeFile = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales/" + locale + ".json").toFile();
+ File localeFile = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("locales/" + locale + ".json").toFile();
// Check if we have already downloaded the locale file
if (localeFile.exists()) {
@@ -149,7 +149,7 @@ public class LocaleUtils {
if (locale.equals("en_us")) {
try {
- File hashFile = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales/en_us.hash").toFile();
+ File hashFile = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("locales/en_us.hash").toFile();
if (hashFile.exists()) {
try (BufferedReader br = new BufferedReader(new FileReader(hashFile))) {
curHash = br.readLine().trim();
@@ -159,7 +159,7 @@ public class LocaleUtils {
if (clientJarInfo == null) {
// Likely failed to download
- GeyserConnector.getInstance().getLogger().debug("Skipping en_US hash check as client jar is null.");
+ GeyserImpl.getInstance().getLogger().debug("Skipping en_US hash check as client jar is null.");
return;
}
targetHash = clientJarInfo.getSha1();
@@ -169,9 +169,9 @@ public class LocaleUtils {
}
if (!curHash.equals(targetHash)) {
- GeyserConnector.getInstance().getLogger().debug("Locale out of date; re-downloading: " + locale);
+ GeyserImpl.getInstance().getLogger().debug("Locale out of date; re-downloading: " + locale);
} else {
- GeyserConnector.getInstance().getLogger().debug("Locale already downloaded and up-to date: " + locale);
+ GeyserImpl.getInstance().getLogger().debug("Locale already downloaded and up-to date: " + locale);
return;
}
}
@@ -188,7 +188,7 @@ public class LocaleUtils {
String hash = ASSET_MAP.get("minecraft/lang/" + locale + ".json").getHash();
WebUtils.downloadFile("https://resources.download.minecraft.net/" + hash.substring(0, 2) + "/" + hash, localeFile.toString());
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error("Unable to download locale file hash", e);
+ GeyserImpl.getInstance().getLogger().error("Unable to download locale file hash", e);
}
}
@@ -198,7 +198,7 @@ public class LocaleUtils {
* @param locale Locale to load
*/
private static void loadLocale(String locale) {
- File localeFile = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales/" + locale + ".json").toFile();
+ File localeFile = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("locales/" + locale + ".json").toFile();
// Load the locale
if (localeFile.exists()) {
@@ -213,7 +213,7 @@ public class LocaleUtils {
// Parse the file as json
JsonNode localeObj;
try {
- localeObj = GeyserConnector.JSON_MAPPER.readTree(localeStream);
+ localeObj = GeyserImpl.JSON_MAPPER.readTree(localeStream);
} catch (Exception e) {
throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.json", locale), e);
}
@@ -241,7 +241,7 @@ public class LocaleUtils {
throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.file", locale, e.getMessage()));
}
} else {
- GeyserConnector.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.missing", locale));
+ GeyserImpl.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.missing", locale));
}
}
@@ -253,11 +253,11 @@ public class LocaleUtils {
private static void downloadEN_US(File localeFile) {
try {
// Let the user know we are downloading the JAR
- GeyserConnector.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.download.en_us"));
- GeyserConnector.getInstance().getLogger().debug("Download URL: " + clientJarInfo.getUrl());
+ GeyserImpl.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.download.en_us"));
+ GeyserImpl.getInstance().getLogger().debug("Download URL: " + clientJarInfo.getUrl());
// Download the smallest JAR (client or server)
- Path tmpFilePath = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("tmp_locale.jar");
+ Path tmpFilePath = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("tmp_locale.jar");
WebUtils.downloadFile(clientJarInfo.getUrl(), tmpFilePath.toString());
// Load in the JAR as a zip and extract the file
@@ -279,14 +279,14 @@ public class LocaleUtils {
}
// Store the latest jar hash
- FileUtils.writeFile(GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales/en_us.hash").toString(), clientJarInfo.getSha1().toCharArray());
+ FileUtils.writeFile(GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("locales/en_us.hash").toString(), clientJarInfo.getSha1().toCharArray());
// Delete the nolonger needed client/server jar
Files.delete(tmpFilePath);
- GeyserConnector.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.download.en_us.done"));
+ GeyserImpl.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.download.en_us.done"));
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.en_us"), e);
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.en_us"), e);
}
}
@@ -303,7 +303,7 @@ public class LocaleUtils {
localeStrings = LocaleUtils.LOCALE_MAPPINGS.get(LanguageUtils.getDefaultLocale());
if (localeStrings == null) {
// Don't cause a NPE if the locale is STILL missing
- GeyserConnector.getInstance().getLogger().debug("MISSING DEFAULT LOCALE: " + LanguageUtils.getDefaultLocale());
+ GeyserImpl.getInstance().getLogger().debug("MISSING DEFAULT LOCALE: " + LanguageUtils.getDefaultLocale());
return messageText;
}
}
diff --git a/core/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java b/core/src/main/java/org/geysermc/geyser/utils/LoginEncryptionUtils.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/LoginEncryptionUtils.java
index a189544b7..1b23f0cba 100644
--- a/core/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/LoginEncryptionUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonNode;
@@ -37,11 +37,11 @@ import com.nukkitx.network.util.Preconditions;
import com.nukkitx.protocol.bedrock.packet.LoginPacket;
import com.nukkitx.protocol.bedrock.packet.ServerToClientHandshakePacket;
import com.nukkitx.protocol.bedrock.util.EncryptionUtils;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.configuration.GeyserConfiguration;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.auth.AuthData;
-import org.geysermc.connector.network.session.auth.BedrockClientData;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.session.auth.AuthData;
+import org.geysermc.geyser.network.session.auth.BedrockClientData;
import org.geysermc.cumulus.CustomForm;
import org.geysermc.cumulus.ModalForm;
import org.geysermc.cumulus.SimpleForm;
@@ -132,13 +132,13 @@ public class LoginEncryptionUtils {
private static void encryptConnectionWithCert(GeyserSession session, String clientData, JsonNode certChainData) {
try {
- GeyserConnector connector = session.getConnector();
+ GeyserImpl geyser = session.getGeyser();
boolean validChain = validateChainData(certChainData);
- connector.getLogger().debug(String.format("Is player data valid? %s", validChain));
+ geyser.getLogger().debug(String.format("Is player data valid? %s", validChain));
- if (!validChain && !session.getConnector().getConfig().isEnableProxyConnections()) {
+ if (!validChain && !session.getGeyser().getConfig().isEnableProxyConnections()) {
session.disconnect(LanguageUtils.getLocaleStringLog("geyser.network.remote.invalid_xbox_account"));
return;
}
@@ -174,14 +174,14 @@ public class LoginEncryptionUtils {
LoginEncryptionUtils.startEncryptionHandshake(session, identityPublicKey);
} catch (Throwable e) {
// An error can be thrown on older Java 8 versions about an invalid key
- if (connector.getConfig().isDebugMode()) {
+ if (geyser.getConfig().isDebugMode()) {
e.printStackTrace();
}
- sendEncryptionFailedMessage(connector);
+ sendEncryptionFailedMessage(geyser);
}
} else {
- sendEncryptionFailedMessage(connector);
+ sendEncryptionFailedMessage(geyser);
}
} catch (Exception ex) {
session.disconnect("disconnectionScreen.internalError.cantConnect");
@@ -203,10 +203,10 @@ public class LoginEncryptionUtils {
session.sendUpstreamPacketImmediately(packet);
}
- private static void sendEncryptionFailedMessage(GeyserConnector connector) {
+ private static void sendEncryptionFailedMessage(GeyserImpl geyser) {
if (!HAS_SENT_ENCRYPTION_MESSAGE) {
- connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_1"));
- connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_2", "https://geysermc.org/supported_java"));
+ geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_1"));
+ geyser.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_2", "https://geysermc.org/supported_java"));
HAS_SENT_ENCRYPTION_MESSAGE = true;
}
}
@@ -215,7 +215,7 @@ public class LoginEncryptionUtils {
// Set DoDaylightCycle to false so the time doesn't accelerate while we're here
session.setDaylightCycle(false);
- GeyserConfiguration config = session.getConnector().getConfig();
+ GeyserConfiguration config = session.getGeyser().getConfig();
boolean isPasswordAuthEnabled = config.getRemote().isPasswordAuthentication();
session.sendForm(
diff --git a/core/src/main/java/org/geysermc/connector/utils/MapColor.java b/core/src/main/java/org/geysermc/geyser/utils/MapColor.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/utils/MapColor.java
rename to core/src/main/java/org/geysermc/geyser/utils/MapColor.java
index 2a7c34888..9b0a75e56 100644
--- a/core/src/main/java/org/geysermc/connector/utils/MapColor.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/MapColor.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
public enum MapColor {
COLOR_0(-1, -1, -1),
diff --git a/core/src/main/java/org/geysermc/connector/utils/MathUtils.java b/core/src/main/java/org/geysermc/geyser/utils/MathUtils.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/MathUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/MathUtils.java
index 3ccf812d3..ef638a5cd 100644
--- a/core/src/main/java/org/geysermc/connector/utils/MathUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/MathUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
public class MathUtils {
diff --git a/core/src/main/java/org/geysermc/connector/utils/NewsHandler.java b/core/src/main/java/org/geysermc/geyser/utils/NewsHandler.java
similarity index 93%
rename from core/src/main/java/org/geysermc/connector/utils/NewsHandler.java
rename to core/src/main/java/org/geysermc/geyser/utils/NewsHandler.java
index 24df69817..5ff743630 100644
--- a/core/src/main/java/org/geysermc/connector/utils/NewsHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/NewsHandler.java
@@ -23,16 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonSyntaxException;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
-import org.geysermc.connector.common.ChatColor;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.logger.GeyserLogger;
+import org.geysermc.geyser.common.ChatColor;
+import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.floodgate.news.NewsItem;
import org.geysermc.floodgate.news.NewsItemAction;
import org.geysermc.floodgate.news.data.AnnouncementData;
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
public class NewsHandler {
private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
- private final GeyserLogger logger = GeyserConnector.getInstance().getLogger();
+ private final GeyserLogger logger = GeyserImpl.getInstance().getLogger();
private final Gson gson = new Gson();
private final Map activeNewsItems = new HashMap<>();
@@ -109,7 +109,7 @@ public class NewsHandler {
// }
break;
case BROADCAST_TO_OPERATORS:
- for (GeyserSession player : GeyserConnector.getInstance().getSessionManager().getSessions().values()) {
+ for (GeyserSession player : GeyserImpl.getInstance().getSessionManager().getSessions().values()) {
if (player.getOpPermissionLevel() >= 2) {
session.sendMessage(ChatColor.GREEN + news.getMessage());
}
diff --git a/core/src/main/java/org/geysermc/connector/utils/PaintingType.java b/core/src/main/java/org/geysermc/geyser/utils/PaintingType.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/PaintingType.java
rename to core/src/main/java/org/geysermc/geyser/utils/PaintingType.java
index 02482be34..aec9cb7c1 100644
--- a/core/src/main/java/org/geysermc/connector/utils/PaintingType.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/PaintingType.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/core/src/main/java/org/geysermc/connector/utils/PistonBehavior.java b/core/src/main/java/org/geysermc/geyser/utils/PistonBehavior.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/utils/PistonBehavior.java
rename to core/src/main/java/org/geysermc/geyser/utils/PistonBehavior.java
index 67579e2ad..74678479c 100644
--- a/core/src/main/java/org/geysermc/connector/utils/PistonBehavior.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/PistonBehavior.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import java.util.Locale;
diff --git a/core/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java b/core/src/main/java/org/geysermc/geyser/utils/PluginMessageUtils.java
similarity index 94%
rename from core/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/PluginMessageUtils.java
index 686dadd17..a2d5b98f7 100644
--- a/core/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/PluginMessageUtils.java
@@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCustomPayloadPacket;
import com.google.common.base.Charsets;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
import java.nio.ByteBuffer;
@@ -38,7 +38,7 @@ public class PluginMessageUtils {
private static final byte[] FLOODGATE_REGISTER_DATA;
static {
- byte[] data = GeyserConnector.NAME.getBytes(Charsets.UTF_8);
+ byte[] data = GeyserImpl.NAME.getBytes(Charsets.UTF_8);
GEYSER_BRAND_DATA =
ByteBuffer.allocate(data.length + getVarIntLength(data.length))
.put(writeVarInt(data.length))
diff --git a/core/src/main/java/org/geysermc/connector/utils/ResourcePack.java b/core/src/main/java/org/geysermc/geyser/utils/ResourcePack.java
similarity index 92%
rename from core/src/main/java/org/geysermc/connector/utils/ResourcePack.java
rename to core/src/main/java/org/geysermc/geyser/utils/ResourcePack.java
index 91d1b782e..cfa7c4051 100644
--- a/core/src/main/java/org/geysermc/connector/utils/ResourcePack.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/ResourcePack.java
@@ -23,9 +23,9 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.geyser.GeyserImpl;
import java.io.File;
import java.util.HashMap;
@@ -57,7 +57,7 @@ public class ResourcePack {
* Loop through the packs directory and locate valid resource pack files
*/
public static void loadPacks() {
- File directory = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("packs").toFile();
+ File directory = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("packs").toFile();
if (!directory.exists()) {
directory.mkdir();
@@ -96,7 +96,7 @@ public class ResourcePack {
}
});
} catch (Exception e) {
- GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.resource_pack.broken", file.getName()));
+ GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.resource_pack.broken", file.getName()));
e.printStackTrace();
} finally {
if (stream != null) {
diff --git a/core/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java b/core/src/main/java/org/geysermc/geyser/utils/ResourcePackManifest.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java
rename to core/src/main/java/org/geysermc/geyser/utils/ResourcePackManifest.java
index 972c732fc..c9563b5fc 100644
--- a/core/src/main/java/org/geysermc/connector/utils/ResourcePackManifest.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/ResourcePackManifest.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
diff --git a/core/src/main/java/org/geysermc/connector/utils/SettingsUtils.java b/core/src/main/java/org/geysermc/geyser/utils/SettingsUtils.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/SettingsUtils.java
index f859aba48..c79c84735 100644
--- a/core/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/SettingsUtils.java
@@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.WorldManager;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.world.WorldManager;
import org.geysermc.cumulus.CustomForm;
import org.geysermc.cumulus.component.DropdownComponent;
import org.geysermc.cumulus.response.CustomFormResponse;
@@ -52,7 +52,7 @@ public class SettingsUtils {
// Only show the client title if any of the client settings are available
boolean showClientSettings = session.getPreferencesCache().isAllowShowCoordinates()
|| CooldownUtils.getDefaultShowCooldown() != CooldownUtils.CooldownType.DISABLED
- || session.getConnector().getConfig().isAllowCustomSkulls();
+ || session.getGeyser().getConfig().isAllowCustomSkulls();
if (showClientSettings) {
builder.label("geyser.settings.title.client");
@@ -70,7 +70,7 @@ public class SettingsUtils {
builder.dropdown(cooldownDropdown);
}
- if (session.getConnector().getConfig().isAllowCustomSkulls()) {
+ if (session.getGeyser().getConfig().isAllowCustomSkulls()) {
builder.toggle("geyser.settings.option.customSkulls", session.getPreferencesCache().isPrefersCustomSkulls());
}
}
@@ -97,7 +97,7 @@ public class SettingsUtils {
builder.label("geyser.settings.title.game_rules")
.translator(LocaleUtils::getLocaleString); // we need translate gamerules next
- WorldManager worldManager = GeyserConnector.getInstance().getWorldManager();
+ WorldManager worldManager = GeyserImpl.getInstance().getWorldManager();
for (GameRule gamerule : GameRule.values()) {
if (gamerule.equals(GameRule.UNKNOWN)) {
continue;
@@ -130,7 +130,7 @@ public class SettingsUtils {
session.getPreferencesCache().setCooldownPreference(cooldownType);
}
- if (session.getConnector().getConfig().isAllowCustomSkulls()) {
+ if (session.getGeyser().getConfig().isAllowCustomSkulls()) {
session.getPreferencesCache().setPrefersCustomSkulls(response.next());
}
}
@@ -138,12 +138,12 @@ public class SettingsUtils {
if (canModifyServer) {
GameMode gameMode = GameMode.values()[(int) response.next()];
if (gameMode != null && gameMode != session.getGameMode()) {
- session.getConnector().getWorldManager().setPlayerGameMode(session, gameMode);
+ session.getGeyser().getWorldManager().setPlayerGameMode(session, gameMode);
}
Difficulty difficulty = Difficulty.values()[(int) response.next()];
if (difficulty != null && difficulty != session.getWorldCache().getDifficulty()) {
- session.getConnector().getWorldManager().setDifficulty(session, difficulty);
+ session.getGeyser().getWorldManager().setDifficulty(session, difficulty);
}
}
@@ -155,13 +155,13 @@ public class SettingsUtils {
if (Boolean.class.equals(gamerule.getType())) {
boolean value = response.next();
- if (value != session.getConnector().getWorldManager().getGameRuleBool(session, gamerule)) {
- session.getConnector().getWorldManager().setGameRule(session, gamerule.getJavaID(), value);
+ if (value != session.getGeyser().getWorldManager().getGameRuleBool(session, gamerule)) {
+ session.getGeyser().getWorldManager().setGameRule(session, gamerule.getJavaID(), value);
}
} else if (Integer.class.equals(gamerule.getType())) {
int value = Integer.parseInt(response.next());
- if (value != session.getConnector().getWorldManager().getGameRuleInt(session, gamerule)) {
- session.getConnector().getWorldManager().setGameRule(session, gamerule.getJavaID(), value);
+ if (value != session.getGeyser().getWorldManager().getGameRuleInt(session, gamerule)) {
+ session.getGeyser().getWorldManager().setGameRule(session, gamerule.getJavaID(), value);
}
}
}
diff --git a/core/src/main/java/org/geysermc/connector/utils/SignUtils.java b/core/src/main/java/org/geysermc/geyser/utils/SignUtils.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/SignUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/SignUtils.java
index b324c745d..5cb9182c9 100644
--- a/core/src/main/java/org/geysermc/connector/utils/SignUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/SignUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
/**
* Provides utilities for interacting with signs. Mainly, it deals with the widths of each character.
diff --git a/core/src/main/java/org/geysermc/connector/utils/SoundUtils.java b/core/src/main/java/org/geysermc/geyser/utils/SoundUtils.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/utils/SoundUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/SoundUtils.java
index 5abd9ff57..79aaf94e4 100644
--- a/core/src/main/java/org/geysermc/connector/utils/SoundUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/SoundUtils.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.nukkitx.protocol.bedrock.data.SoundEvent;
diff --git a/core/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java b/core/src/main/java/org/geysermc/geyser/utils/StatisticsUtils.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/StatisticsUtils.java
index eca4f7453..da7bf4705 100644
--- a/core/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/StatisticsUtils.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.github.steveice10.mc.protocol.data.MagicValues;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.github.steveice10.mc.protocol.data.game.statistic.*;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.registry.BlockRegistries;
-import org.geysermc.connector.registry.type.ItemMappings;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.type.ItemMappings;
import org.geysermc.cumulus.SimpleForm;
import org.geysermc.cumulus.response.SimpleFormResponse;
import org.geysermc.cumulus.util.FormImage;
diff --git a/core/src/main/java/org/geysermc/connector/utils/WebUtils.java b/core/src/main/java/org/geysermc/geyser/utils/WebUtils.java
similarity index 87%
rename from core/src/main/java/org/geysermc/connector/utils/WebUtils.java
rename to core/src/main/java/org/geysermc/geyser/utils/WebUtils.java
index b736a282c..52e1783d5 100644
--- a/core/src/main/java/org/geysermc/connector/utils/WebUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/WebUtils.java
@@ -23,10 +23,10 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils;
+package org.geysermc.geyser.utils;
import com.fasterxml.jackson.databind.JsonNode;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.geyser.GeyserImpl;
import java.io.*;
import java.net.HttpURLConnection;
@@ -51,7 +51,7 @@ public class WebUtils {
URL url = new URL(reqURL);
HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET");
- con.setRequestProperty("User-Agent", "Geyser-" + GeyserConnector.getInstance().getPlatformType().toString() + "/" + GeyserConnector.VERSION); // Otherwise Java 8 fails on checking updates
+ con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); // Otherwise Java 8 fails on checking updates
return connectionToString(con);
} catch (Exception e) {
@@ -67,8 +67,8 @@ public class WebUtils {
*/
public static JsonNode getJson(String reqURL) throws IOException {
HttpURLConnection con = (HttpURLConnection) new URL(reqURL).openConnection();
- con.setRequestProperty("User-Agent", "Geyser-" + GeyserConnector.getInstance().getPlatformType().toString() + "/" + GeyserConnector.VERSION);
- return GeyserConnector.JSON_MAPPER.readTree(con.getInputStream());
+ con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION);
+ return GeyserImpl.JSON_MAPPER.readTree(con.getInputStream());
}
/**
@@ -80,7 +80,7 @@ public class WebUtils {
public static void downloadFile(String reqURL, String fileLocation) {
try {
HttpURLConnection con = (HttpURLConnection) new URL(reqURL).openConnection();
- con.setRequestProperty("User-Agent", "Geyser-" + GeyserConnector.getInstance().getPlatformType().toString() + "/" + GeyserConnector.VERSION);
+ con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION);
InputStream in = con.getInputStream();
Files.copy(in, Paths.get(fileLocation), StandardCopyOption.REPLACE_EXISTING);
} catch (Exception e) {
@@ -101,7 +101,7 @@ public class WebUtils {
HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "text/plain");
- con.setRequestProperty("User-Agent", "Geyser-" + GeyserConnector.getInstance().getPlatformType().toString() + "/" + GeyserConnector.VERSION);
+ con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION);
con.setDoOutput(true);
OutputStream out = con.getOutputStream();
@@ -156,7 +156,7 @@ public class WebUtils {
HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- con.setRequestProperty("User-Agent", "Geyser-" + GeyserConnector.getInstance().getPlatformType().toString() + "/" + GeyserConnector.VERSION);
+ con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION);
con.setDoOutput(true);
try (OutputStream out = con.getOutputStream()) {
diff --git a/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java b/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2BooleanMap.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java
rename to core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2BooleanMap.java
index 0e31e4be6..f28614597 100644
--- a/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2BooleanMap.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2BooleanMap.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils.collections;
+package org.geysermc.geyser.utils.collections;
import it.unimi.dsi.fastutil.ints.AbstractInt2BooleanMap;
import it.unimi.dsi.fastutil.objects.ObjectSet;
diff --git a/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java b/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2ByteMap.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java
rename to core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2ByteMap.java
index 5aa4bc528..6917ccf51 100644
--- a/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2ByteMap.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2ByteMap.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils.collections;
+package org.geysermc.geyser.utils.collections;
import it.unimi.dsi.fastutil.ints.AbstractInt2ByteMap;
import it.unimi.dsi.fastutil.ints.Int2ByteMap;
diff --git a/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java b/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2IntMap.java
similarity index 98%
rename from core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java
rename to core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2IntMap.java
index 77e6740bc..bab3dbc04 100644
--- a/core/src/main/java/org/geysermc/connector/utils/collections/FixedInt2IntMap.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/collections/FixedInt2IntMap.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils.collections;
+package org.geysermc.geyser.utils.collections;
import it.unimi.dsi.fastutil.ints.AbstractInt2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
diff --git a/core/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java b/core/src/main/java/org/geysermc/geyser/utils/collections/LecternHasBookMap.java
similarity index 88%
rename from core/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java
rename to core/src/main/java/org/geysermc/geyser/utils/collections/LecternHasBookMap.java
index f6371af8d..50d392a10 100644
--- a/core/src/main/java/org/geysermc/connector/utils/collections/LecternHasBookMap.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/collections/LecternHasBookMap.java
@@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils.collections;
+package org.geysermc.geyser.utils.collections;
import com.nukkitx.math.vector.Vector3i;
import com.nukkitx.nbt.NbtMap;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.inventory.translators.LecternInventoryTranslator;
-import org.geysermc.connector.network.translators.world.WorldManager;
-import org.geysermc.connector.utils.BlockEntityUtils;
+import org.geysermc.geyser.network.session.GeyserSession;
+import org.geysermc.geyser.network.translators.inventory.translators.LecternInventoryTranslator;
+import org.geysermc.geyser.network.translators.world.WorldManager;
+import org.geysermc.geyser.utils.BlockEntityUtils;
/**
* Map that takes advantage of its internals for fast operations on block states to determine if they are lecterns.
@@ -42,7 +42,7 @@ public class LecternHasBookMap extends FixedInt2BooleanMap {
* optimize lectern determining.
*/
public void handleBlockChange(GeyserSession session, int blockState, Vector3i position) {
- WorldManager worldManager = session.getConnector().getWorldManager();
+ WorldManager worldManager = session.getGeyser().getWorldManager();
int offset = blockState - this.start;
if (offset < 0 || offset >= this.value.length) {
diff --git a/core/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java b/core/src/main/java/org/geysermc/geyser/utils/collections/Object2IntBiMap.java
similarity index 99%
rename from core/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java
rename to core/src/main/java/org/geysermc/geyser/utils/collections/Object2IntBiMap.java
index 29364437c..6a576105c 100644
--- a/core/src/main/java/org/geysermc/connector/utils/collections/Object2IntBiMap.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/collections/Object2IntBiMap.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils.collections;
+package org.geysermc.geyser.utils.collections;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/core/src/main/java/org/geysermc/connector/utils/collections/package-info.java b/core/src/main/java/org/geysermc/geyser/utils/collections/package-info.java
similarity index 97%
rename from core/src/main/java/org/geysermc/connector/utils/collections/package-info.java
rename to core/src/main/java/org/geysermc/geyser/utils/collections/package-info.java
index 3400f3f2a..3628e0385 100644
--- a/core/src/main/java/org/geysermc/connector/utils/collections/package-info.java
+++ b/core/src/main/java/org/geysermc/geyser/utils/collections/package-info.java
@@ -31,4 +31,4 @@
* and {@link java.util.Map#containsKey(java.lang.Object)} can be performed by simply checking the bounds of the map
* size and its "start" integer.
*/
-package org.geysermc.connector.utils.collections;
\ No newline at end of file
+package org.geysermc.geyser.utils.collections;
\ No newline at end of file
diff --git a/core/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java b/core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java
similarity index 98%
rename from core/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java
rename to core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java
index cfb2bbc97..2f4e95f1e 100644
--- a/core/src/test/java/org/geysermc/connector/network/translators/chat/MessageTranslatorTest.java
+++ b/core/src/test/java/org/geysermc/geyser/network/translators/chat/MessageTranslatorTest.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.network.translators.chat;
+package org.geysermc.geyser.network.translators.chat;
import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
import org.junit.Assert;
@@ -55,7 +55,7 @@ public class MessageTranslatorTest {
"§r§7[§r§eH§r§7]§r§f §r§7§lGUEST§r§l §r§9»§r§7 §r§frtm516§r§7: §r§fThis is an amazing bedrock test message");
// Test translation and positional arguments
- // Disabled due to not having an GeyserConnector instance, hence it fails
+ // Disabled due to not having an Geyser instance, hence it fails
//messages.put("{\"translate\":\"death.attack.player\",\"with\":[{\"text\":\"rtm516\",\"insertion\":\"rtm516\"},{\"text\":\"*invincible_rt\",\"insertion\":\"*invincible_rt\"}]}",
// "rtm516 was slain by *invincible_rt");
//// Test translation with the ' character (which MessageFormat requires special handling for)
diff --git a/core/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java b/core/src/test/java/org/geysermc/geyser/utils/collections/GeyserCollectionsTest.java
similarity index 99%
rename from core/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java
rename to core/src/test/java/org/geysermc/geyser/utils/collections/GeyserCollectionsTest.java
index acd8bcbd0..1cbfd57a5 100644
--- a/core/src/test/java/org/geysermc/connector/utils/collections/GeyserCollectionsTest.java
+++ b/core/src/test/java/org/geysermc/geyser/utils/collections/GeyserCollectionsTest.java
@@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
-package org.geysermc.connector.utils.collections;
+package org.geysermc.geyser.utils.collections;
import org.junit.Assert;
import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index 99a4b3374..67e068212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
bootstrap
common
core
+ api