GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

The Great Refactor Part 3 - Entire project restructure

Browse source
This commit is contained in:
RednedEpic 2021-11-20 17:29:46 -06:00
parent 3f5cb29ee0
commit 2c663e0ee5
561 changed files with 2468 additions and 2457 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -37,9 +37,9 @@ import org.geysermc.connector.network.session.auth.AuthData;
*/
@Deprecated
public class GeyserSession {
private final org.geysermc.geyser.network.session.GeyserSession handle;
private final org.geysermc.geyser.session.GeyserSession handle;
public GeyserSession(org.geysermc.geyser.network.session.GeyserSession handle) {
public GeyserSession(org.geysermc.geyser.session.GeyserSession handle) {
this.handle = handle;
}

4
core/src/main/java/org/geysermc/connector/network/session/auth/AuthData.java
View file

@ -34,9 +34,9 @@ import java.util.UUID;
* @deprecated legacy code
*/
public class AuthData {
private final org.geysermc.geyser.network.session.auth.AuthData handle;
private final org.geysermc.geyser.session.auth.AuthData handle;
public AuthData(org.geysermc.geyser.network.session.auth.AuthData handle) {
public AuthData(org.geysermc.geyser.session.auth.AuthData handle) {
this.handle = handle;
}

2
core/src/main/java/org/geysermc/geyser/utils/Constants.java → core/src/main/java/org/geysermc/geyser/Constants.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.utils;
package org.geysermc.geyser;
import java.net.URI;
import java.net.URISyntaxException;

10
core/src/main/java/org/geysermc/geyser/FloodgateKeyLoader.java
View file

@ -26,9 +26,9 @@
package org.geysermc.geyser;
import org.geysermc.geyser.api.logger.GeyserLogger;
import org.geysermc.geyser.common.AuthType;
import org.geysermc.geyser.session.auth.AuthType;
import org.geysermc.geyser.configuration.GeyserJacksonConfiguration;
import org.geysermc.geyser.utils.LanguageUtils;
import org.geysermc.geyser.text.GeyserLocale;
import java.nio.file.Files;
import java.nio.file.Path;
@ -44,10 +44,10 @@ public class FloodgateKeyLoader {
if (floodgateDataFolder != null) {
Path autoKey = floodgateDataFolder.resolve("key.pem");
if (Files.exists(autoKey)) {
logger.info(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.auto_loaded"));
logger.info(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.auto_loaded"));
return autoKey;
} else {
logger.error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.missing_key"));
logger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.missing_key"));
}
}
@ -60,7 +60,7 @@ public class FloodgateKeyLoader {
}
if (!Files.exists(floodgateKey)) {
logger.error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed"));
logger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed"));
}
return floodgateKey;

7
core/src/main/java/org/geysermc/geyser/bootstrap/GeyserBootstrap.java → core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java
View file

@ -23,16 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.bootstrap;
package org.geysermc.geyser;
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.level.GeyserWorldManager;
import org.geysermc.geyser.level.WorldManager;
import org.geysermc.geyser.ping.IGeyserPingPassthrough;
import javax.annotation.Nullable;

59
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View file

@ -42,23 +42,25 @@ 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.session.auth.AuthType;
import org.geysermc.geyser.configuration.GeyserConfiguration;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.metrics.Metrics;
import org.geysermc.geyser.pack.ResourcePack;
import org.geysermc.geyser.session.SessionManager;
import org.geysermc.geyser.text.GeyserLocale;
import org.geysermc.geyser.text.MinecraftLocale;
import org.geysermc.geyser.util.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.session.GeyserSession;
import org.geysermc.geyser.translator.text.MessageTranslator;
import org.geysermc.geyser.translator.inventory.item.ItemTranslator;
import org.geysermc.geyser.level.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.geyser.util.*;
import org.geysermc.floodgate.crypto.AesCipher;
import org.geysermc.floodgate.crypto.AesKeyProducer;
import org.geysermc.floodgate.crypto.Base64Topping;
@ -140,7 +142,7 @@ public class GeyserImpl extends Geyser {
logger.info("******************************************");
logger.info("");
logger.info(LanguageUtils.getLocaleStringLog("geyser.core.load", NAME, VERSION));
logger.info(GeyserLocale.getLocaleStringLog("geyser.core.load", NAME, VERSION));
logger.info("");
logger.info("******************************************");
@ -148,8 +150,6 @@ public class GeyserImpl extends Geyser {
logger.setDebug(config.isDebugMode());
PacketTranslatorRegistry.init();
/* Initialize translators and registries */
BlockRegistries.init();
Registries.init();
@ -157,7 +157,7 @@ public class GeyserImpl extends Geyser {
EntityDefinitions.init();
ItemTranslator.init();
MessageTranslator.init();
LocaleUtils.init();
MinecraftLocale.init();
ScoreboardUpdater.init();
ResourcePack.loadPacks();
@ -207,10 +207,10 @@ public class GeyserImpl extends Geyser {
Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath());
cipher = new AesCipher(new Base64Topping());
cipher.init(key);
logger.info(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.loaded_key"));
logger.info(GeyserLocale.getLocaleStringLog("geyser.auth.floodgate.loaded_key"));
skinUploader = new FloodgateSkinUploader(this).start();
} catch (Exception exception) {
logger.severe(LanguageUtils.getLocaleStringLog("geyser.auth.floodgate.bad_key"), exception);
logger.severe(GeyserLocale.getLocaleStringLog("geyser.auth.floodgate.bad_key"), exception);
}
}
this.timeSyncer = timeSyncer;
@ -272,9 +272,9 @@ public class GeyserImpl extends Geyser {
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())));
logger.info(GeyserLocale.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())));
logger.severe(GeyserLocale.getLocaleStringLog("geyser.core.fail", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
throwable.printStackTrace();
}
}).join();
@ -286,7 +286,7 @@ public class GeyserImpl extends Geyser {
// 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("defaultLocale", GeyserLocale::getDefaultLocale));
metrics.addCustomChart(new Metrics.SimplePie("version", () -> GeyserImpl.VERSION));
metrics.addCustomChart(new Metrics.AdvancedPie("playerPlatform", () -> {
Map<String, Integer> valueMap = new HashMap<>();
@ -380,29 +380,29 @@ public class GeyserImpl extends Geyser {
}
double completeTime = (System.currentTimeMillis() - startupTime) / 1000D;
String message = LanguageUtils.getLocaleStringLog("geyser.core.finish.done", new DecimalFormat("#.###").format(completeTime)) + " ";
String message = GeyserLocale.getLocaleStringLog("geyser.core.finish.done", new DecimalFormat("#.###").format(completeTime)) + " ";
if (isGui) {
message += LanguageUtils.getLocaleStringLog("geyser.core.finish.gui");
message += GeyserLocale.getLocaleStringLog("geyser.core.finish.gui");
} else {
message += LanguageUtils.getLocaleStringLog("geyser.core.finish.console");
message += GeyserLocale.getLocaleStringLog("geyser.core.finish.console");
}
logger.info(message);
if (platformType == PlatformType.STANDALONE) {
logger.warning(LanguageUtils.getLocaleStringLog("geyser.core.movement_warn"));
logger.warning(GeyserLocale.getLocaleStringLog("geyser.core.movement_warn"));
}
newsHandler.handleNews(null, NewsItemAction.ON_SERVER_STARTED);
}
public void shutdown() {
bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown"));
bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown"));
shuttingDown = true;
if (sessionManager.size() >= 1) {
bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.log", sessionManager.size()));
bootstrap.getGeyserLogger().info(GeyserLocale.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"));
bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.kick.done"));
}
scheduledThread.shutdown();
@ -416,7 +416,7 @@ public class GeyserImpl extends Geyser {
newsHandler.shutdown();
this.getCommandManager().getCommands().clear();
bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.done"));
bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.done"));
}
/**
@ -442,12 +442,7 @@ public class GeyserImpl extends Geyser {
*/
@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()) {
for (GeyserSession session : sessionManager.getAllSessions()) {
if (session.getAuthData().getXuid().equals(xuid)) {
return session;
}

8
core/src/main/java/org/geysermc/geyser/common/main/IGeyserMain.java → core/src/main/java/org/geysermc/geyser/GeyserMain.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.common.main;
package org.geysermc.geyser;
import javax.swing.*;
import java.io.InputStream;
@ -31,7 +31,7 @@ import java.lang.reflect.Method;
import java.util.Locale;
import java.util.Scanner;
public class IGeyserMain {
public class GeyserMain {
/**
* Displays the run help message in the console and a message box if running with a gui
@ -54,10 +54,10 @@ public class IGeyserMain {
private String createMessage() {
StringBuilder message = new StringBuilder();
InputStream helpStream = IGeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/" + Locale.getDefault().toString() + ".txt");
InputStream helpStream = GeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/" + Locale.getDefault().toString() + ".txt");
if (helpStream == null) {
helpStream = IGeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/en_US.txt");
helpStream = GeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/en_US.txt");
}
Scanner help = new Scanner(helpStream).useDelimiter("\\Z");

2
core/src/main/java/org/geysermc/geyser/command/CommandExecutor.java
View file

@ -27,7 +27,7 @@ package org.geysermc.geyser.command;
import lombok.AllArgsConstructor;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import javax.annotation.Nullable;
import java.util.ArrayList;

10
core/src/main/java/org/geysermc/geyser/command/CommandManager.java
View file

@ -30,8 +30,8 @@ import lombok.Getter;
import org.geysermc.common.PlatformType;
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 org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.GeyserLocale;
import java.util.*;
@ -61,7 +61,7 @@ public abstract class CommandManager {
public void registerCommand(GeyserCommand command) {
commands.put(command.getName(), command);
geyser.getLogger().debug(LanguageUtils.getLocaleStringLog("geyser.commands.registered", command.getName()));
geyser.getLogger().debug(GeyserLocale.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) {
geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.invalid"));
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.invalid"));
return;
}
@ -99,7 +99,7 @@ public abstract class CommandManager {
if (!cmd.isBedrockOnly()) {
cmd.execute(null, sender, args);
} else {
geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.bedrock_only"));
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.command.bedrock_only"));
}
}
}

6
core/src/main/java/org/geysermc/geyser/command/CommandSender.java
View file

@ -25,7 +25,7 @@
package org.geysermc.geyser.command;
import org.geysermc.geyser.utils.LanguageUtils;
import org.geysermc.geyser.text.GeyserLocale;
/**
* Implemented on top of any class that can send a command.
@ -49,12 +49,12 @@ public interface CommandSender {
boolean isConsole();
/**
* Returns the locale of the command sender. Defaults to the default locale at {@link LanguageUtils#getDefaultLocale()}.
* Returns the locale of the command sender. Defaults to the default locale at {@link GeyserLocale#getDefaultLocale()}.
*
* @return the locale of the command sender.
*/
default String getLocale() {
return LanguageUtils.getDefaultLocale();
return GeyserLocale.getDefaultLocale();
}
/**

2
core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
View file

@ -28,7 +28,7 @@ package org.geysermc.geyser.command;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import javax.annotation.Nullable;
import java.util.ArrayList;

2
core/src/main/java/org/geysermc/geyser/command/defaults/AdvancementsCommand.java
View file

@ -27,7 +27,7 @@ package org.geysermc.geyser.command.defaults;
import org.geysermc.geyser.command.CommandSender;
import org.geysermc.geyser.command.GeyserCommand;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
public class AdvancementsCommand extends GeyserCommand {
public AdvancementsCommand(String name, String description, String permission) {

36
core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java
View file

@ -33,12 +33,12 @@ import org.geysermc.common.PlatformType;
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.text.ChatColor;
import org.geysermc.geyser.text.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 org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.GeyserLocale;
import org.geysermc.geyser.util.WebUtils;
import java.io.FileOutputStream;
import java.io.IOException;
@ -61,7 +61,7 @@ public class DumpCommand extends GeyserCommand {
public void execute(GeyserSession session, CommandSender sender, String[] args) {
// Only allow the console to create dumps on Geyser Standalone
if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
return;
}
@ -80,7 +80,7 @@ public class DumpCommand extends GeyserCommand {
AsteriskSerializer.showSensitive = showSensitive;
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.collecting", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.collecting", sender.getLocale()));
String dumpData;
try {
if (offlineDump) {
@ -92,29 +92,29 @@ public class DumpCommand extends GeyserCommand {
dumpData = MAPPER.writeValueAsString(new DumpInfo(addLog));
}
} catch (IOException e) {
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.collect_error", sender.getLocale()));
geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e);
sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.collect_error", sender.getLocale()));
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e);
return;
}
String uploadedDumpUrl = "";
if (offlineDump) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.writing", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.writing", sender.getLocale()));
try {
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()));
geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.write_error_short"), e);
sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.write_error", sender.getLocale()));
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.write_error_short"), e);
return;
}
uploadedDumpUrl = "dump.json";
} else {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.uploading", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.uploading", sender.getLocale()));
String response;
JsonNode responseNode;
@ -122,22 +122,22 @@ public class DumpCommand extends GeyserCommand {
response = WebUtils.post(DUMP_URL + "documents", dumpData);
responseNode = MAPPER.readTree(response);
} catch (IOException e) {
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.upload_error", sender.getLocale()));
geyser.getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error", sender.getLocale()));
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
return;
}
if (!responseNode.has("key")) {
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.dump.upload_error_short", sender.getLocale()) + ": " + (responseNode.has("message") ? responseNode.get("message").asText() : response));
sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error_short", sender.getLocale()) + ": " + (responseNode.has("message") ? responseNode.get("message").asText() : response));
return;
}
uploadedDumpUrl = DUMP_URL + responseNode.get("key").asText();
}
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.dump.message", sender.getLocale()) + " " + ChatColor.DARK_AQUA + uploadedDumpUrl);
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.message", sender.getLocale()) + " " + ChatColor.DARK_AQUA + uploadedDumpUrl);
if (!sender.isConsole()) {
geyser.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.commands.dump.created", sender.getName(), uploadedDumpUrl));
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.commands.dump.created", sender.getName(), uploadedDumpUrl));
}
}

10
core/src/main/java/org/geysermc/geyser/command/defaults/HelpCommand.java
View file

@ -28,9 +28,9 @@ package org.geysermc.geyser.command.defaults;
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 org.geysermc.geyser.text.ChatColor;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.GeyserLocale;
import java.util.Collections;
import java.util.Map;
@ -56,7 +56,7 @@ public class HelpCommand extends GeyserCommand {
public void execute(GeyserSession session, CommandSender sender, String[] args) {
int page = 1;
int maxPage = 1;
String header = LanguageUtils.getPlayerLocaleString("geyser.commands.help.header", sender.getLocale(), page, maxPage);
String header = GeyserLocale.getPlayerLocaleString("geyser.commands.help.header", sender.getLocale(), page, maxPage);
sender.sendMessage(header);
Map<String, GeyserCommand> cmds = geyser.getCommandManager().getCommands();
@ -70,7 +70,7 @@ public class HelpCommand extends GeyserCommand {
}
sender.sendMessage(ChatColor.YELLOW + "/geyser " + cmdName + ChatColor.WHITE + ": " +
LanguageUtils.getPlayerLocaleString(cmd.getDescription(), sender.getLocale()));
GeyserLocale.getPlayerLocaleString(cmd.getDescription(), sender.getLocale()));
}
}
}

6
core/src/main/java/org/geysermc/geyser/command/defaults/ListCommand.java
View file

@ -28,8 +28,8 @@ package org.geysermc.geyser.command.defaults;
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 org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.GeyserLocale;
import java.util.stream.Collectors;
@ -45,7 +45,7 @@ public class ListCommand extends GeyserCommand {
@Override
public void execute(GeyserSession session, CommandSender sender, String[] args) {
String message = LanguageUtils.getPlayerLocaleString("geyser.commands.list.message", sender.getLocale(),
String message = GeyserLocale.getPlayerLocaleString("geyser.commands.list.message", sender.getLocale(),
geyser.getSessionManager().size(),
geyser.getSessionManager().getAllSessions().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));

4
core/src/main/java/org/geysermc/geyser/command/defaults/OffhandCommand.java
View file

@ -31,8 +31,8 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.Server
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;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.BlockUtils;
public class OffhandCommand extends GeyserCommand {

6
core/src/main/java/org/geysermc/geyser/command/defaults/ReloadCommand.java
View file

@ -29,8 +29,8 @@ import org.geysermc.common.PlatformType;
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 org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.GeyserLocale;
public class ReloadCommand extends GeyserCommand {
@ -47,7 +47,7 @@ public class ReloadCommand extends GeyserCommand {
return;
}
String message = LanguageUtils.getPlayerLocaleString("geyser.commands.reload.message", sender.getLocale());
String message = GeyserLocale.getPlayerLocaleString("geyser.commands.reload.message", sender.getLocale());
sender.sendMessage(message);

4
core/src/main/java/org/geysermc/geyser/command/defaults/SettingsCommand.java
View file

@ -28,8 +28,8 @@ package org.geysermc.geyser.command.defaults;
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;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.SettingsUtils;
public class SettingsCommand extends GeyserCommand {
public SettingsCommand(GeyserImpl geyser, String name, String description, String permission) {

2
core/src/main/java/org/geysermc/geyser/command/defaults/StatisticsCommand.java
View file

@ -30,7 +30,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCl
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.session.GeyserSession;
public class StatisticsCommand extends GeyserCommand {

6
core/src/main/java/org/geysermc/geyser/command/defaults/StopCommand.java
View file

@ -29,8 +29,8 @@ import org.geysermc.common.PlatformType;
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 org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.GeyserLocale;
import java.util.Collections;
@ -48,7 +48,7 @@ public class StopCommand extends GeyserCommand {
@Override
public void execute(GeyserSession session, CommandSender sender, String[] args) {
if (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
return;
}

22
core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
View file

@ -30,12 +30,12 @@ import org.geysermc.common.PlatformType;
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.text.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 org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.FileUtils;
import org.geysermc.geyser.text.GeyserLocale;
import org.geysermc.geyser.util.WebUtils;
import java.io.IOException;
import java.net.URLEncoder;
@ -63,12 +63,12 @@ public class VersionCommand extends GeyserCommand {
bedrockVersions = MinecraftProtocol.SUPPORTED_BEDROCK_CODECS.get(0).getMinecraftVersion();
}
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.version", sender.getLocale(),
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.version", sender.getLocale(),
GeyserImpl.NAME, GeyserImpl.VERSION, MinecraftProtocol.getJavaVersion(), bedrockVersions));
// Disable update checking in dev mode and for players in Geyser Standalone
if (GeyserImpl.getInstance().isProductionEnvironment() && !(!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.checking", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.checking", sender.getLocale()));
try {
Properties gitProp = new Properties();
gitProp.load(FileUtils.getResource("git.properties"));
@ -79,17 +79,17 @@ public class VersionCommand extends GeyserCommand {
int latestBuildNum = Integer.parseInt(buildXML.replaceAll("<(\\\\)?(/)?buildNumber>", "").trim());
int buildNum = Integer.parseInt(gitProp.getProperty("git.build.number"));
if (latestBuildNum == buildNum) {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.no_updates", sender.getLocale()));
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.no_updates", sender.getLocale()));
} else {
sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.outdated",
sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.outdated",
sender.getLocale(), (latestBuildNum - buildNum), "https://ci.geysermc.org/"));
}
} else {
throw new AssertionError("buildNumber missing");
}
} catch (IOException | AssertionError | NumberFormatException e) {
GeyserImpl.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.version.failed"), e);
sender.sendMessage(ChatColor.RED + LanguageUtils.getPlayerLocaleString("geyser.commands.version.failed", sender.getLocale()));
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.version.failed"), e);
sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.version.failed", sender.getLocale()));
}
}
}

9
core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java
View file

@ -27,10 +27,9 @@ package org.geysermc.geyser.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.geysermc.geyser.api.logger.GeyserLogger;
import org.geysermc.geyser.common.AuthType;
import org.geysermc.geyser.configuration.EmoteOffhandWorkaroundOption;
import org.geysermc.geyser.session.auth.AuthType;
import org.geysermc.geyser.network.CIDRMatcher;
import org.geysermc.geyser.utils.LanguageUtils;
import org.geysermc.geyser.text.GeyserLocale;
import java.nio.file.Path;
import java.util.List;
@ -174,9 +173,9 @@ public interface GeyserConfiguration {
static void checkGeyserConfiguration(GeyserConfiguration geyserConfig, GeyserLogger geyserLogger) {
if (geyserConfig.getConfigVersion() < CURRENT_CONFIG_VERSION) {
geyserLogger.warning(LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.outdated"));
geyserLogger.warning(GeyserLocale.getLocaleStringLog("geyser.bootstrap.config.outdated"));
} else if (geyserConfig.getConfigVersion() > CURRENT_CONFIG_VERSION) {
geyserLogger.warning(LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.too_new"));
geyserLogger.warning(GeyserLocale.getLocaleStringLog("geyser.bootstrap.config.too_new"));
}
}
}

8
core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
View file

@ -35,10 +35,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Getter;
import lombok.Setter;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.common.AuthType;
import org.geysermc.geyser.common.serializer.AsteriskSerializer;
import org.geysermc.geyser.session.auth.AuthType;
import org.geysermc.geyser.text.AsteriskSerializer;
import org.geysermc.geyser.network.CIDRMatcher;
import org.geysermc.geyser.utils.LanguageUtils;
import org.geysermc.geyser.text.GeyserLocale;
import java.io.IOException;
import java.nio.file.Path;
@ -257,7 +257,7 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
try {
return Integer.parseInt(value);
} catch (NumberFormatException e) {
System.err.println(LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.invalid_port"));
System.err.println(GeyserLocale.getLocaleStringLog("geyser.bootstrap.config.invalid_port"));
return 25565;
}
}

29
core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
View file

@ -36,13 +36,12 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.common.serializer.AsteriskSerializer;
import org.geysermc.geyser.text.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.geyser.session.GeyserSession;
import org.geysermc.geyser.util.FileUtils;
import org.geysermc.geyser.util.WebUtils;
import org.geysermc.floodgate.util.DeviceOs;
import org.geysermc.floodgate.util.FloodgateInfoHolder;
@ -53,6 +52,7 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -177,7 +177,24 @@ public class DumpInfo {
this.internalIP = "***";
}
this.dockerCheck = DockerCheck.checkBasic();
this.dockerCheck = checkDockerBasic();
}
// By default, Geyser now sets the IP to the local IP in all cases on plugin versions so we don't notify the user of anything
// However we still have this check for the potential future bug
private boolean checkDockerBasic() {
try {
String OS = System.getProperty("os.name").toLowerCase();
if (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0) {
String output = new String(java.nio.file.Files.readAllBytes(Paths.get("/proc/1/cgroup")));
if (output.contains("docker")) {
return true;
}
}
} catch (Exception ignored) { } // Ignore any errors, inc ip failed to fetch, process could not run or access denied
return false;
}
}

4
core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java
View file

@ -34,7 +34,9 @@ import lombok.experimental.Accessors;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.entity.factory.BaseEntityFactory;
import org.geysermc.geyser.entity.factory.EntityFactory;
import org.geysermc.geyser.entity.type.Entity;
import org.geysermc.geyser.registry.Registries;
import org.geysermc.geyser.translator.entity.EntityMetadataTranslator;
import java.util.List;
import java.util.Locale;
@ -78,7 +80,7 @@ public record EntityDefinition<T extends Entity>(EntityFactory<T> factory, Entit
return;
}
translator.translateFunction().accept(entity, metadata);
translator.translate(entity, metadata);
}
@Setter

33
core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
View file

@ -34,22 +34,23 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
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.entity.type.*;
import org.geysermc.geyser.entity.type.living.*;
import org.geysermc.geyser.entity.type.living.animal.*;
import org.geysermc.geyser.entity.type.living.animal.horse.*;
import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.ParrotEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.TameableEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.WolfEntity;
import org.geysermc.geyser.entity.type.living.merchant.AbstractMerchantEntity;
import org.geysermc.geyser.entity.type.living.merchant.VillagerEntity;
import org.geysermc.geyser.entity.type.living.monster.*;
import org.geysermc.geyser.entity.type.living.monster.raid.PillagerEntity;
import org.geysermc.geyser.entity.type.living.monster.raid.RaidParticipantEntity;
import org.geysermc.geyser.entity.type.living.monster.raid.SpellcasterIllagerEntity;
import org.geysermc.geyser.entity.type.living.monster.raid.VindicatorEntity;
import org.geysermc.geyser.entity.type.player.PlayerEntity;
import org.geysermc.geyser.translator.text.MessageTranslator;
import org.geysermc.geyser.registry.Registries;
public final class EntityDefinitions {

18
core/src/main/java/org/geysermc/geyser/utils/InteractiveTagManager.java → core/src/main/java/org/geysermc/geyser/entity/InteractiveTagManager.java
View file

@ -23,20 +23,20 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.utils;
package org.geysermc.geyser.entity;
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.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.entity.type.Entity;
import org.geysermc.geyser.entity.type.living.MobEntity;
import org.geysermc.geyser.entity.type.living.animal.AnimalEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.HorseEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.WolfEntity;
import org.geysermc.geyser.entity.type.living.merchant.VillagerEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.EnumSet;

4
core/src/main/java/org/geysermc/geyser/entity/factory/BaseEntityFactory.java
View file

@ -26,9 +26,9 @@
package org.geysermc.geyser.entity.factory;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.Entity;
import org.geysermc.geyser.entity.type.Entity;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

2
core/src/main/java/org/geysermc/geyser/entity/factory/EntityFactory.java
View file

@ -25,7 +25,7 @@
package org.geysermc.geyser.entity.factory;
import org.geysermc.geyser.entity.Entity;
import org.geysermc.geyser.entity.type.Entity;
public interface EntityFactory<T extends Entity> {
}

4
core/src/main/java/org/geysermc/geyser/entity/factory/ExperienceOrbEntityFactory.java
View file

@ -26,8 +26,8 @@
package org.geysermc.geyser.entity.factory;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.ExpOrbEntity;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.type.ExpOrbEntity;
import org.geysermc.geyser.session.GeyserSession;
@FunctionalInterface
public interface ExperienceOrbEntityFactory extends EntityFactory<ExpOrbEntity> {

6
core/src/main/java/org/geysermc/geyser/entity/factory/PaintingEntityFactory.java
View file

@ -26,9 +26,9 @@
package org.geysermc.geyser.entity.factory;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.PaintingEntity;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.utils.PaintingType;
import org.geysermc.geyser.entity.type.PaintingEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.PaintingType;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/AbstractArrowEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/AbstractArrowEntity.java
View file

@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

9
core/src/main/java/org/geysermc/geyser/entity/AreaEffectCloudEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/AreaEffectCloudEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,9 @@ 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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.utils.EffectUtils;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.Registries;
import java.util.UUID;
@ -64,7 +65,7 @@ public class AreaEffectCloudEntity extends Entity {
public void setParticle(EntityMetadata<Particle, ?> entityMetadata) {
Particle particle = entityMetadata.getValue();
int particleId = EffectUtils.getParticleId(session, particle.getType());
int particleId = Registries.PARTICLES.map(particle.getType(), mapping -> mapping.getParticleId(this.session)).orElse(-1);
if (particleId != -1) {
dirtyMetadata.put(EntityData.AREA_EFFECT_CLOUD_PARTICLE_ID, particleId);
}

6
core/src/main/java/org/geysermc/geyser/entity/BoatEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,9 @@ 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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

5
core/src/main/java/org/geysermc/geyser/entity/CommandBlockMinecartEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/CommandBlockMinecartEntity.java
View file

@ -23,11 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/DefaultBlockMinecartEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/DefaultBlockMinecartEntity.java
View file

@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/EnderCrystalEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/EnderCrystalEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,8 @@ 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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.Optional;
import java.util.UUID;

10
core/src/main/java/org/geysermc/geyser/entity/Entity.java → core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,11 @@ import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.kyori.adventure.text.Component;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.chat.MessageTranslator;
import org.geysermc.geyser.utils.MathUtils;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.GeyserDirtyMetadata;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.text.MessageTranslator;
import org.geysermc.geyser.util.MathUtils;
import java.util.Optional;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/ExpOrbEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ExpOrbEntity.java
View file

@ -23,11 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.session.GeyserSession;
public class ExpOrbEntity extends Entity {

5
core/src/main/java/org/geysermc/geyser/entity/FallingBlockEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/FallingBlockEntity.java
View file

@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

11
core/src/main/java/org/geysermc/geyser/entity/FireworkEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,11 @@ 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.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.player.PlayerEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.FireworkColor;
import org.geysermc.geyser.util.MathUtils;
import org.geysermc.floodgate.util.DeviceOs;
import java.util.ArrayList;

17
core/src/main/java/org/geysermc/geyser/entity/FishingHookEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/FishingHookEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
@ -31,14 +31,15 @@ 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.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.entity.EntityDefinitions;
import org.geysermc.geyser.entity.type.player.PlayerEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.physics.BoundingBox;
import org.geysermc.geyser.translator.collision.BlockCollision;
import org.geysermc.geyser.level.block.BlockStateValues;
import org.geysermc.geyser.registry.BlockRegistries;
import org.geysermc.geyser.utils.BlockPositionIterator;
import org.geysermc.geyser.utils.BlockUtils;
import org.geysermc.geyser.level.block.BlockPositionIterator;
import org.geysermc.geyser.util.BlockUtils;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;

7
core/src/main/java/org/geysermc/geyser/entity/FurnaceMinecartEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/FurnaceMinecartEntity.java
View file

@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.block.BlockStateValues;
import java.util.UUID;

9
core/src/main/java/org/geysermc/geyser/entity/ItemEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ItemEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,10 @@ 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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.item.ItemTranslator;
import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.inventory.item.ItemTranslator;
import org.geysermc.geyser.level.block.BlockStateValues;
import java.util.UUID;

7
core/src/main/java/org/geysermc/geyser/entity/ItemFrameEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ItemFrameEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@ -39,8 +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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.item.ItemTranslator;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.inventory.item.ItemTranslator;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/ItemedFireballEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ItemedFireballEntity.java
View file

@ -23,10 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/LeashKnotEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/LeashKnotEntity.java
View file

@ -23,10 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/LightningEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/LightningEntity.java
View file

@ -23,11 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;

9
core/src/main/java/org/geysermc/geyser/entity/LivingEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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,12 @@ import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import org.geysermc.geyser.utils.AttributeUtils;
import org.geysermc.geyser.utils.ChunkUtils;
import org.geysermc.geyser.util.AttributeUtils;
import org.geysermc.geyser.util.ChunkUtils;
import java.util.ArrayList;
import java.util.Collections;

5
core/src/main/java/org/geysermc/geyser/entity/MinecartEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/MinecartEntity.java
View file

@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

7
core/src/main/java/org/geysermc/geyser/entity/PaintingEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/PaintingEntity.java
View file

@ -23,12 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.packet.AddPaintingPacket;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.utils.PaintingType;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.PaintingType;
import java.util.UUID;

7
core/src/main/java/org/geysermc/geyser/entity/SpawnerMinecartEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/SpawnerMinecartEntity.java
View file

@ -23,12 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.block.BlockStateValues;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/TNTEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/TNTEntity.java
View file

@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
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 com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

7
core/src/main/java/org/geysermc/geyser/entity/ThrowableEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ThrowableEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
import com.nukkitx.math.vector.Vector3f;
@ -31,8 +31,9 @@ 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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.world.block.BlockStateValues;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.block.BlockStateValues;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/ThrowableItemEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java
View file

@ -23,11 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

7
core/src/main/java/org/geysermc/geyser/entity/ThrownPotionEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/ThrownPotionEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
@ -33,8 +33,9 @@ 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.geyser.GeyserImpl;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.item.Potion;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.inventory.item.Potion;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.EnumSet;

2
core/src/main/java/org/geysermc/geyser/entity/Tickable.java → core/src/main/java/org/geysermc/geyser/entity/type/Tickable.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
/**
* Implemented onto anything that should have code ran every Minecraft tick - 50 milliseconds.

7
core/src/main/java/org/geysermc/geyser/entity/TippedArrowEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/TippedArrowEntity.java
View file

@ -23,13 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
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.geyser.network.session.GeyserSession;
import org.geysermc.geyser.network.translators.item.TippedArrowPotion;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.inventory.item.TippedArrowPotion;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/TridentEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/TridentEntity.java
View file

@ -23,10 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/WitherSkullEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/WitherSkullEntity.java
View file

@ -23,11 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity;
package org.geysermc.geyser.entity.type;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/AbstractFishEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/AbstractFishEntity.java
View file

@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/AgeableEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java
View file

@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/AmbientEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/AmbientEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/ArmorStandEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Rotation;
@ -37,8 +37,8 @@ import lombok.Getter;
import net.kyori.adventure.text.Component;
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 org.geysermc.geyser.entity.type.LivingEntity;
import org.geysermc.geyser.session.GeyserSession;
import java.util.Optional;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/BatEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/BatEntity.java
View file

@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/CreatureEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/CreatureEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/FlyingEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/FlyingEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/GlowSquidEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/GlowSquidEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/GolemEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/GolemEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/IronGolemEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java
View file

@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/MagmaCubeEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/MagmaCubeEntity.java
View file

@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/MobEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/MobEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
@ -31,8 +31,8 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import lombok.Getter;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.LivingEntity;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.type.LivingEntity;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/SlimeEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/SlimeEntity.java
View file

@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/SnowGolemEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/SnowGolemEntity.java
View file

@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

8
core/src/main/java/org/geysermc/geyser/entity/living/SquidEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/SquidEntity.java
View file

@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.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.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 org.geysermc.geyser.entity.type.Tickable;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.level.block.BlockStateValues;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/WaterEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/WaterEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living;
package org.geysermc.geyser.entity.type.living;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/animal/AnimalEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AnimalEntity.java
View file

@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.living.AgeableEntity;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.type.living.AgeableEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/AxolotlEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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;
@ -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 org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/BeeEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/BeeEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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;
@ -33,7 +33,7 @@ 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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/ChickenEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/ChickenEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/FoxEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FoxEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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;
@ -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 org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/GoatEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/GoatEntity.java
View file

@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/animal/HoglinEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/HoglinEntity.java
View file

@ -23,15 +23,15 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import org.geysermc.geyser.utils.DimensionUtils;
import org.geysermc.geyser.util.DimensionUtils;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/MooshroomEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/MooshroomEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/OcelotEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/OcelotEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/PandaEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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;
@ -33,7 +33,7 @@ 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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/PigEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PigEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/PolarBearEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PolarBearEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/animal/PufferFishEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PufferFishEntity.java
View file

@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.living.AbstractFishEntity;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.type.living.AbstractFishEntity;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/RabbitEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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;
@ -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 org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

5
core/src/main/java/org/geysermc/geyser/entity/living/animal/SheepEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/SheepEntity.java
View file

@ -23,15 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/animal/StriderEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/StriderEntity.java
View file

@ -23,14 +23,14 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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.geyser.entity.Entity;
import org.geysermc.geyser.entity.type.Entity;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/animal/TropicalFishEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TropicalFishEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.living.animal;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.google.common.collect.ImmutableList;
@ -31,8 +31,8 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import it.unimi.dsi.fastutil.ints.IntList;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.living.AbstractFishEntity;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.entity.type.living.AbstractFishEntity;
import org.geysermc.geyser.session.GeyserSession;
import java.util.List;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/TurtleEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TurtleEntity.java
View file

@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

6
core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/AbstractHorseEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal.horse;
package org.geysermc.geyser.entity.type.living.animal.horse;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import com.google.common.collect.ImmutableSet;
@ -36,8 +36,8 @@ import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
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.entity.type.living.animal.AnimalEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.Set;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/ChestedHorseEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/ChestedHorseEntity.java
View file

@ -23,11 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal.horse;
package org.geysermc.geyser.entity.type.living.animal.horse;
import com.nukkitx.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/HorseEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/HorseEntity.java
View file

@ -23,13 +23,13 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal.horse;
package org.geysermc.geyser.entity.type.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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/LlamaEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/LlamaEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal.horse;
package org.geysermc.geyser.entity.type.living.animal.horse;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import com.nukkitx.math.vector.Vector3f;
@ -31,7 +31,7 @@ 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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/horse/TraderLlamaEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/TraderLlamaEntity.java
View file

@ -23,12 +23,12 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal.horse;
package org.geysermc.geyser.entity.type.living.animal.horse;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID;

4
core/src/main/java/org/geysermc/geyser/entity/living/animal/tameable/CatEntity.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/CatEntity.java
View file

@ -23,7 +23,7 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.living.animal.tameable;
package org.geysermc.geyser.entity.type.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;
@ -32,7 +32,7 @@ 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.geyser.entity.EntityDefinition;
import org.geysermc.geyser.network.session.GeyserSession;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping;
import java.util.UUID;

Some files were not shown because too many files have changed in this diff Show more