ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

refactor: relocate packages

Browse source
This commit is contained in:
ineanto 2023-12-06 22:53:51 +01:00
parent 8d1c80a5fb
commit fc2be7c7a4
4 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -12,6 +12,7 @@ https://www.spigotmc.org/resources/nicko.113868/
## Known bugs: ## Known bugs:
- Disguising will heal and feed players to full health.
- Players who have operator (OP) status lose access to the Operator Items tab in creative mode - Players who have operator (OP) status lose access to the Operator Items tab in creative mode
after disguising **(1.20 and up)**. after disguising **(1.20 and up)**.
- When disguising and only changing their display name, players will have the new default - When disguising and only changing their display name, players will have the new default

24
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>xyz.ineanto</groupId> <groupId>xyz.ineanto</groupId>
<artifactId>nicko</artifactId> <artifactId>nicko</artifactId>
<version>1.0.1-RC1</version> <version>1.0.2-RC1</version>
<name>Nicko</name> <name>Nicko</name>
<properties> <properties>
@ -162,43 +162,43 @@
<relocations> <relocations>
<relocation> <relocation>
<pattern>net.wesjd.anvilgui</pattern> <pattern>net.wesjd.anvilgui</pattern>
<shadedPattern>net.artelnatif.libs.anvilgui</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.anvilgui</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>xyz.xenondevs.invui</pattern> <pattern>xyz.xenondevs</pattern>
<shadedPattern>net.artelnatif.libs.invui</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.invui</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.github.jsixface</pattern> <pattern>com.github.jsixface</pattern>
<shadedPattern>net.artelnatif.libs.yaml</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.yaml</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.fasterxml.jackson.dataformat</pattern> <pattern>com.fasterxml.jackson.dataformat</pattern>
<shadedPattern>net.artelnatif.libs.jackson.yaml</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.jackson.yaml</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.fasterxml.jackson.core</pattern> <pattern>com.fasterxml.jackson.core</pattern>
<shadedPattern>net.artelnatif.libs.jackson.core</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.jackson.core</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.mariadb.jdbc</pattern> <pattern>org.mariadb.jdbc</pattern>
<shadedPattern>net.artelnatif.libs.mariadb</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.mariadb</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>redis.clients</pattern> <pattern>redis.clients</pattern>
<shadedPattern>net.artelnatif.libs.redis</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.redis</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.pool2</pattern> <pattern>org.apache.commons.pool2</pattern>
<shadedPattern>net.artelnatif.libs.pool2</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.pool2</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.google.code.gson</pattern> <pattern>com.google.code.gson</pattern>
<shadedPattern>net.artelnatif.libs.gson</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.gson</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.mysql</pattern> <pattern>com.mysql</pattern>
<shadedPattern>net.artelnatif.libs.mysql</shadedPattern> <shadedPattern>xyz.ineanto.nicko.libs.mysql</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
<!-- Prevents breaking AnvilGUI's VersionWrapper. --> <!-- Prevents breaking AnvilGUI's VersionWrapper. -->

2
src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java
View file

@ -149,7 +149,7 @@ public class AppearanceManager {
player.teleport(player.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN); player.teleport(player.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
player.setAllowFlight(wasAllowedToFly); player.setAllowFlight(wasAllowedToFly);
player.setFlying(wasFlying); player.setFlying(wasFlying);
player.updateInventory(); // Marked as unstable. player.updateInventory();
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

8
src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java
View file

@ -16,9 +16,12 @@ import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.ineanto.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;
import java.util.Optional; import java.util.Optional;
import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class PlayerJoinListener implements Listener { public class PlayerJoinListener implements Listener {
private final Logger logger = Logger.getLogger("PlayerJoinListener");
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
@ -51,7 +54,10 @@ public class PlayerJoinListener implements Listener {
optionalOnlinePlayerProfile.ifPresent(profile -> { optionalOnlinePlayerProfile.ifPresent(profile -> {
final AppearanceManager appearanceManager = new AppearanceManager(online); final AppearanceManager appearanceManager = new AppearanceManager(online);
final boolean needsASkinChange = profile.getSkin() != null && !profile.getSkin().equals(online.getName()); final boolean needsASkinChange = profile.getSkin() != null && !profile.getSkin().equals(online.getName());
appearanceManager.updateForOthers(needsASkinChange, false); final ActionResult actionResult = appearanceManager.updateForOthers(needsASkinChange, false);
if (actionResult.isError()) {
logger.warning("Something wrong happened while updating players to joining player (" + actionResult.getErrorKey() + ")");
}
}); });
} }
}, 20L); }, 20L);