From 88c940431b04383efc3bca1e527feb7120701b22 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 13 Apr 2024 20:53:31 +0100 Subject: [PATCH] rename the package --- .../backend/common/CachedResponse.java | 2 +- .../mcutils/backend/common/ColorUtils.java | 2 +- .../xyz/mcutils/backend/common/DNSUtils.java | 6 +-- .../backend/common/EndpointStatus.java | 2 +- .../xyz/mcutils/backend/common/EnumUtils.java | 2 +- .../mcutils/backend/common/ExpiringSet.java | 2 +- .../xyz/mcutils/backend/common/IPUtils.java | 2 +- .../mcutils/backend/common/ImageUtils.java | 2 +- .../backend/common/JavaMinecraftVersion.java | 2 +- .../mcutils/backend/common/PlayerUtils.java | 6 +-- .../mcutils/backend/common/ServerUtils.java | 2 +- .../xyz/mcutils/backend/common/Tuple.java | 2 +- .../xyz/mcutils/backend/common/UUIDUtils.java | 2 +- .../mcutils/backend/common/WebRequest.java | 4 +- .../common/packet/MinecraftBedrockPacket.java | 2 +- .../common/packet/MinecraftJavaPacket.java | 2 +- .../bedrock/BedrockPacketUnconnectedPing.java | 4 +- .../bedrock/BedrockPacketUnconnectedPong.java | 6 +-- .../JavaPacketHandshakingInSetProtocol.java | 4 +- .../impl/java/JavaPacketStatusInStart.java | 4 +- .../renderer/IsometricSkinRenderer.java | 4 +- .../backend/common/renderer/SkinRenderer.java | 8 ++-- .../common/renderer/impl/BodyRenderer.java | 10 ++--- .../renderer/impl/IsometricHeadRenderer.java | 8 ++-- .../common/renderer/impl/SquareRenderer.java | 8 ++-- .../xyz/mcutils/backend/config/Config.java | 2 +- .../backend/config/OpenAPIConfiguration.java | 2 +- .../mcutils/backend/config/RedisConfig.java | 2 +- .../backend/controller/HomeController.java | 4 +- .../backend/controller/MojangController.java | 6 +-- .../backend/controller/PlayerController.java | 10 ++--- .../backend/controller/ServerController.java | 8 ++-- .../exception/ExceptionControllerAdvice.java | 4 +- .../exception/impl/BadRequestException.java | 2 +- .../impl/InternalServerErrorException.java | 2 +- .../impl/MojangAPIRateLimitException.java | 2 +- .../exception/impl/RateLimitException.java | 2 +- .../impl/ResourceNotFoundException.java | 2 +- .../backend/log/TransactionLogger.java | 4 +- .../model/cache/CachedEndpointStatus.java | 4 +- .../model/cache/CachedMinecraftServer.java | 8 ++-- .../backend/model/cache/CachedPlayer.java | 6 +-- .../backend/model/cache/CachedPlayerName.java | 4 +- .../model/cache/CachedPlayerSkinPart.java | 2 +- .../mcutils/backend/model/dns/DNSRecord.java | 2 +- .../backend/model/dns/impl/ARecord.java | 4 +- .../backend/model/dns/impl/SRVRecord.java | 4 +- .../mcutils/backend/model/player/Cape.java | 2 +- .../mcutils/backend/model/player/Player.java | 10 ++--- .../backend/model/response/ErrorResponse.java | 2 +- .../model/server/BedrockMinecraftServer.java | 4 +- .../model/server/JavaMinecraftServer.java | 14 +++---- .../backend/model/server/MinecraftServer.java | 12 +++--- .../mcutils/backend/model/skin/ISkinPart.java | 10 ++--- .../xyz/mcutils/backend/model/skin/Skin.java | 8 ++-- .../model/token/JavaServerStatusToken.java | 6 +-- .../model/token/MojangProfileToken.java | 12 +++--- .../token/MojangUsernameToUuidToken.java | 2 +- .../repository/EndpointStatusRepository.java | 2 +- .../MinecraftServerCacheRepository.java | 2 +- .../repository/PlayerCacheRepository.java | 2 +- .../repository/PlayerNameCacheRepository.java | 2 +- .../PlayerSkinPartCacheRepository.java | 2 +- .../backend/service/MojangService.java | 18 ++++---- .../backend/service/PlayerService.java | 42 +++++++++---------- .../backend/service/ServerService.java | 24 +++++------ .../service/pinger/MinecraftServerPinger.java | 4 +- .../impl/BedrockMinecraftServerPinger.java | 14 +++---- .../impl/JavaMinecraftServerPinger.java | 22 +++++----- .../backend}/tests/MojangControllerTests.java | 2 +- .../backend}/tests/PlayerControllerTests.java | 2 +- .../backend}/tests/ServerControllerTests.java | 2 +- 72 files changed, 203 insertions(+), 203 deletions(-) rename src/test/java/{cc/fascinated => xyz/mcutils/backend}/tests/MojangControllerTests.java (96%) rename src/test/java/{cc/fascinated => xyz/mcutils/backend}/tests/PlayerControllerTests.java (99%) rename src/test/java/{cc/fascinated => xyz/mcutils/backend}/tests/ServerControllerTests.java (98%) diff --git a/src/main/java/xyz/mcutils/backend/common/CachedResponse.java b/src/main/java/xyz/mcutils/backend/common/CachedResponse.java index b0dc16a..f31d3a2 100644 --- a/src/main/java/xyz/mcutils/backend/common/CachedResponse.java +++ b/src/main/java/xyz/mcutils/backend/common/CachedResponse.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/common/ColorUtils.java b/src/main/java/xyz/mcutils/backend/common/ColorUtils.java index 8afab40..e514d32 100644 --- a/src/main/java/xyz/mcutils/backend/common/ColorUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/ColorUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.NonNull; import lombok.experimental.UtilityClass; diff --git a/src/main/java/xyz/mcutils/backend/common/DNSUtils.java b/src/main/java/xyz/mcutils/backend/common/DNSUtils.java index c509975..b6c9c24 100644 --- a/src/main/java/xyz/mcutils/backend/common/DNSUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/DNSUtils.java @@ -1,13 +1,13 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; -import cc.fascinated.model.dns.impl.ARecord; -import cc.fascinated.model.dns.impl.SRVRecord; import lombok.NonNull; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; import org.xbill.DNS.Lookup; import org.xbill.DNS.Record; import org.xbill.DNS.Type; +import xyz.mcutils.backend.model.dns.impl.ARecord; +import xyz.mcutils.backend.model.dns.impl.SRVRecord; /** * @author Braydon diff --git a/src/main/java/xyz/mcutils/backend/common/EndpointStatus.java b/src/main/java/xyz/mcutils/backend/common/EndpointStatus.java index 1dfae67..dba480a 100644 --- a/src/main/java/xyz/mcutils/backend/common/EndpointStatus.java +++ b/src/main/java/xyz/mcutils/backend/common/EndpointStatus.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/common/EnumUtils.java b/src/main/java/xyz/mcutils/backend/common/EnumUtils.java index 8a4560e..d010b31 100644 --- a/src/main/java/xyz/mcutils/backend/common/EnumUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/EnumUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.NonNull; import lombok.experimental.UtilityClass; diff --git a/src/main/java/xyz/mcutils/backend/common/ExpiringSet.java b/src/main/java/xyz/mcutils/backend/common/ExpiringSet.java index 2562eb4..58565ae 100644 --- a/src/main/java/xyz/mcutils/backend/common/ExpiringSet.java +++ b/src/main/java/xyz/mcutils/backend/common/ExpiringSet.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.NonNull; import net.jodah.expiringmap.ExpirationPolicy; diff --git a/src/main/java/xyz/mcutils/backend/common/IPUtils.java b/src/main/java/xyz/mcutils/backend/common/IPUtils.java index eed9631..fb61af7 100644 --- a/src/main/java/xyz/mcutils/backend/common/IPUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/IPUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import jakarta.servlet.http.HttpServletRequest; import lombok.experimental.UtilityClass; diff --git a/src/main/java/xyz/mcutils/backend/common/ImageUtils.java b/src/main/java/xyz/mcutils/backend/common/ImageUtils.java index 2400fa0..9b57513 100644 --- a/src/main/java/xyz/mcutils/backend/common/ImageUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/ImageUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import jakarta.validation.constraints.NotNull; import lombok.SneakyThrows; diff --git a/src/main/java/xyz/mcutils/backend/common/JavaMinecraftVersion.java b/src/main/java/xyz/mcutils/backend/common/JavaMinecraftVersion.java index 652e984..5b1d71f 100644 --- a/src/main/java/xyz/mcutils/backend/common/JavaMinecraftVersion.java +++ b/src/main/java/xyz/mcutils/backend/common/JavaMinecraftVersion.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/xyz/mcutils/backend/common/PlayerUtils.java b/src/main/java/xyz/mcutils/backend/common/PlayerUtils.java index 8f70071..0384157 100644 --- a/src/main/java/xyz/mcutils/backend/common/PlayerUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/PlayerUtils.java @@ -1,11 +1,11 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; -import xyz.mcutils.backend.Main; -import cc.fascinated.exception.impl.BadRequestException; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.Main; +import xyz.mcutils.backend.exception.impl.BadRequestException; import java.net.URI; import java.net.http.HttpRequest; diff --git a/src/main/java/xyz/mcutils/backend/common/ServerUtils.java b/src/main/java/xyz/mcutils/backend/common/ServerUtils.java index acee04b..881d8dd 100644 --- a/src/main/java/xyz/mcutils/backend/common/ServerUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/ServerUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.experimental.UtilityClass; diff --git a/src/main/java/xyz/mcutils/backend/common/Tuple.java b/src/main/java/xyz/mcutils/backend/common/Tuple.java index d51de5d..03df730 100644 --- a/src/main/java/xyz/mcutils/backend/common/Tuple.java +++ b/src/main/java/xyz/mcutils/backend/common/Tuple.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/common/UUIDUtils.java b/src/main/java/xyz/mcutils/backend/common/UUIDUtils.java index a43fa97..35071e5 100644 --- a/src/main/java/xyz/mcutils/backend/common/UUIDUtils.java +++ b/src/main/java/xyz/mcutils/backend/common/UUIDUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; import io.micrometer.common.lang.NonNull; import lombok.experimental.UtilityClass; diff --git a/src/main/java/xyz/mcutils/backend/common/WebRequest.java b/src/main/java/xyz/mcutils/backend/common/WebRequest.java index 1746cff..c87b9d5 100644 --- a/src/main/java/xyz/mcutils/backend/common/WebRequest.java +++ b/src/main/java/xyz/mcutils/backend/common/WebRequest.java @@ -1,12 +1,12 @@ -package cc.fascinated.common; +package xyz.mcutils.backend.common; -import cc.fascinated.exception.impl.RateLimitException; import lombok.experimental.UtilityClass; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestClient; +import xyz.mcutils.backend.exception.impl.RateLimitException; @UtilityClass public class WebRequest { diff --git a/src/main/java/xyz/mcutils/backend/common/packet/MinecraftBedrockPacket.java b/src/main/java/xyz/mcutils/backend/common/packet/MinecraftBedrockPacket.java index dcf0b2d..52ad8d8 100644 --- a/src/main/java/xyz/mcutils/backend/common/packet/MinecraftBedrockPacket.java +++ b/src/main/java/xyz/mcutils/backend/common/packet/MinecraftBedrockPacket.java @@ -1,4 +1,4 @@ -package cc.fascinated.common.packet; +package xyz.mcutils.backend.common.packet; import lombok.NonNull; diff --git a/src/main/java/xyz/mcutils/backend/common/packet/MinecraftJavaPacket.java b/src/main/java/xyz/mcutils/backend/common/packet/MinecraftJavaPacket.java index 55d4dd9..c176f05 100644 --- a/src/main/java/xyz/mcutils/backend/common/packet/MinecraftJavaPacket.java +++ b/src/main/java/xyz/mcutils/backend/common/packet/MinecraftJavaPacket.java @@ -1,4 +1,4 @@ -package cc.fascinated.common.packet; +package xyz.mcutils.backend.common.packet; import lombok.NonNull; diff --git a/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPing.java b/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPing.java index 3e9a9b6..676a731 100644 --- a/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPing.java +++ b/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPing.java @@ -1,7 +1,7 @@ -package cc.fascinated.common.packet.impl.bedrock; +package xyz.mcutils.backend.common.packet.impl.bedrock; -import cc.fascinated.common.packet.MinecraftBedrockPacket; import lombok.NonNull; +import xyz.mcutils.backend.common.packet.MinecraftBedrockPacket; import java.io.IOException; import java.net.DatagramPacket; diff --git a/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPong.java b/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPong.java index f2e0627..0472f39 100644 --- a/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPong.java +++ b/src/main/java/xyz/mcutils/backend/common/packet/impl/bedrock/BedrockPacketUnconnectedPong.java @@ -1,9 +1,9 @@ -package cc.fascinated.common.packet.impl.bedrock; +package xyz.mcutils.backend.common.packet.impl.bedrock; -import cc.fascinated.common.packet.MinecraftBedrockPacket; -import cc.fascinated.model.server.BedrockMinecraftServer; import lombok.Getter; import lombok.NonNull; +import xyz.mcutils.backend.common.packet.MinecraftBedrockPacket; +import xyz.mcutils.backend.model.server.BedrockMinecraftServer; import java.io.IOException; import java.net.DatagramPacket; diff --git a/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketHandshakingInSetProtocol.java b/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketHandshakingInSetProtocol.java index d589ad2..afcdcfa 100644 --- a/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketHandshakingInSetProtocol.java +++ b/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketHandshakingInSetProtocol.java @@ -1,9 +1,9 @@ -package cc.fascinated.common.packet.impl.java; +package xyz.mcutils.backend.common.packet.impl.java; -import cc.fascinated.common.packet.MinecraftJavaPacket; import lombok.AllArgsConstructor; import lombok.NonNull; import lombok.ToString; +import xyz.mcutils.backend.common.packet.MinecraftJavaPacket; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketStatusInStart.java b/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketStatusInStart.java index bf3a540..b4d6dda 100644 --- a/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketStatusInStart.java +++ b/src/main/java/xyz/mcutils/backend/common/packet/impl/java/JavaPacketStatusInStart.java @@ -1,8 +1,8 @@ -package cc.fascinated.common.packet.impl.java; +package xyz.mcutils.backend.common.packet.impl.java; -import cc.fascinated.common.packet.MinecraftJavaPacket; import lombok.Getter; import lombok.NonNull; +import xyz.mcutils.backend.common.packet.MinecraftJavaPacket; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/xyz/mcutils/backend/common/renderer/IsometricSkinRenderer.java b/src/main/java/xyz/mcutils/backend/common/renderer/IsometricSkinRenderer.java index a93b8ad..2dc57d1 100644 --- a/src/main/java/xyz/mcutils/backend/common/renderer/IsometricSkinRenderer.java +++ b/src/main/java/xyz/mcutils/backend/common/renderer/IsometricSkinRenderer.java @@ -1,6 +1,6 @@ -package cc.fascinated.common.renderer; +package xyz.mcutils.backend.common.renderer; -import cc.fascinated.model.skin.ISkinPart; +import xyz.mcutils.backend.model.skin.ISkinPart; import java.awt.*; import java.awt.geom.AffineTransform; diff --git a/src/main/java/xyz/mcutils/backend/common/renderer/SkinRenderer.java b/src/main/java/xyz/mcutils/backend/common/renderer/SkinRenderer.java index 9b140db..180c2dd 100644 --- a/src/main/java/xyz/mcutils/backend/common/renderer/SkinRenderer.java +++ b/src/main/java/xyz/mcutils/backend/common/renderer/SkinRenderer.java @@ -1,10 +1,10 @@ -package cc.fascinated.common.renderer; +package xyz.mcutils.backend.common.renderer; -import cc.fascinated.common.ImageUtils; -import cc.fascinated.model.skin.ISkinPart; -import cc.fascinated.model.skin.Skin; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.common.ImageUtils; +import xyz.mcutils.backend.model.skin.ISkinPart; +import xyz.mcutils.backend.model.skin.Skin; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/main/java/xyz/mcutils/backend/common/renderer/impl/BodyRenderer.java b/src/main/java/xyz/mcutils/backend/common/renderer/impl/BodyRenderer.java index e8de081..a8d7a63 100644 --- a/src/main/java/xyz/mcutils/backend/common/renderer/impl/BodyRenderer.java +++ b/src/main/java/xyz/mcutils/backend/common/renderer/impl/BodyRenderer.java @@ -1,12 +1,12 @@ -package cc.fascinated.common.renderer.impl; +package xyz.mcutils.backend.common.renderer.impl; -import cc.fascinated.common.ImageUtils; -import cc.fascinated.common.renderer.SkinRenderer; -import cc.fascinated.model.skin.ISkinPart; -import cc.fascinated.model.skin.Skin; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.common.ImageUtils; +import xyz.mcutils.backend.common.renderer.SkinRenderer; +import xyz.mcutils.backend.model.skin.ISkinPart; +import xyz.mcutils.backend.model.skin.Skin; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/src/main/java/xyz/mcutils/backend/common/renderer/impl/IsometricHeadRenderer.java b/src/main/java/xyz/mcutils/backend/common/renderer/impl/IsometricHeadRenderer.java index e4a9e02..f87c1e2 100644 --- a/src/main/java/xyz/mcutils/backend/common/renderer/impl/IsometricHeadRenderer.java +++ b/src/main/java/xyz/mcutils/backend/common/renderer/impl/IsometricHeadRenderer.java @@ -1,8 +1,8 @@ -package cc.fascinated.common.renderer.impl; +package xyz.mcutils.backend.common.renderer.impl; -import cc.fascinated.common.renderer.IsometricSkinRenderer; -import cc.fascinated.model.skin.ISkinPart; -import cc.fascinated.model.skin.Skin; +import xyz.mcutils.backend.common.renderer.IsometricSkinRenderer; +import xyz.mcutils.backend.model.skin.ISkinPart; +import xyz.mcutils.backend.model.skin.Skin; import java.awt.*; import java.awt.geom.AffineTransform; diff --git a/src/main/java/xyz/mcutils/backend/common/renderer/impl/SquareRenderer.java b/src/main/java/xyz/mcutils/backend/common/renderer/impl/SquareRenderer.java index dff099a..d40acf0 100644 --- a/src/main/java/xyz/mcutils/backend/common/renderer/impl/SquareRenderer.java +++ b/src/main/java/xyz/mcutils/backend/common/renderer/impl/SquareRenderer.java @@ -1,11 +1,11 @@ -package cc.fascinated.common.renderer.impl; +package xyz.mcutils.backend.common.renderer.impl; -import cc.fascinated.common.renderer.SkinRenderer; -import cc.fascinated.model.skin.ISkinPart; -import cc.fascinated.model.skin.Skin; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.common.renderer.SkinRenderer; +import xyz.mcutils.backend.model.skin.ISkinPart; +import xyz.mcutils.backend.model.skin.Skin; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/src/main/java/xyz/mcutils/backend/config/Config.java b/src/main/java/xyz/mcutils/backend/config/Config.java index 1a22ba0..6657c2e 100644 --- a/src/main/java/xyz/mcutils/backend/config/Config.java +++ b/src/main/java/xyz/mcutils/backend/config/Config.java @@ -1,4 +1,4 @@ -package cc.fascinated.config; +package xyz.mcutils.backend.config; import jakarta.annotation.PostConstruct; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/config/OpenAPIConfiguration.java b/src/main/java/xyz/mcutils/backend/config/OpenAPIConfiguration.java index 15e2df8..bfeeec2 100644 --- a/src/main/java/xyz/mcutils/backend/config/OpenAPIConfiguration.java +++ b/src/main/java/xyz/mcutils/backend/config/OpenAPIConfiguration.java @@ -1,4 +1,4 @@ -package cc.fascinated.config; +package xyz.mcutils.backend.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; diff --git a/src/main/java/xyz/mcutils/backend/config/RedisConfig.java b/src/main/java/xyz/mcutils/backend/config/RedisConfig.java index 148a496..a71fa79 100644 --- a/src/main/java/xyz/mcutils/backend/config/RedisConfig.java +++ b/src/main/java/xyz/mcutils/backend/config/RedisConfig.java @@ -1,4 +1,4 @@ -package cc.fascinated.config; +package xyz.mcutils.backend.config; import lombok.NonNull; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/xyz/mcutils/backend/controller/HomeController.java b/src/main/java/xyz/mcutils/backend/controller/HomeController.java index 433f7ab..ecccdc0 100644 --- a/src/main/java/xyz/mcutils/backend/controller/HomeController.java +++ b/src/main/java/xyz/mcutils/backend/controller/HomeController.java @@ -1,10 +1,10 @@ -package cc.fascinated.controller; +package xyz.mcutils.backend.controller; -import cc.fascinated.config.Config; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import xyz.mcutils.backend.config.Config; @Controller @RequestMapping(value = "/") diff --git a/src/main/java/xyz/mcutils/backend/controller/MojangController.java b/src/main/java/xyz/mcutils/backend/controller/MojangController.java index 9d3644f..8f4e82f 100644 --- a/src/main/java/xyz/mcutils/backend/controller/MojangController.java +++ b/src/main/java/xyz/mcutils/backend/controller/MojangController.java @@ -1,7 +1,5 @@ -package cc.fascinated.controller; +package xyz.mcutils.backend.controller; -import cc.fascinated.model.cache.CachedEndpointStatus; -import xyz.mcutils.backend.service.MojangService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -9,6 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import xyz.mcutils.backend.model.cache.CachedEndpointStatus; +import xyz.mcutils.backend.service.MojangService; @RestController @Tag(name = "Mojang Controller", description = "The Mojang Controller is used to get information about the Mojang APIs.") diff --git a/src/main/java/xyz/mcutils/backend/controller/PlayerController.java b/src/main/java/xyz/mcutils/backend/controller/PlayerController.java index 78fec91..e9bc75f 100644 --- a/src/main/java/xyz/mcutils/backend/controller/PlayerController.java +++ b/src/main/java/xyz/mcutils/backend/controller/PlayerController.java @@ -1,9 +1,5 @@ -package cc.fascinated.controller; +package xyz.mcutils.backend.controller; -import cc.fascinated.model.cache.CachedPlayer; -import cc.fascinated.model.cache.CachedPlayerName; -import cc.fascinated.model.player.Player; -import xyz.mcutils.backend.service.PlayerService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +8,10 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import xyz.mcutils.backend.model.cache.CachedPlayer; +import xyz.mcutils.backend.model.cache.CachedPlayerName; +import xyz.mcutils.backend.model.player.Player; +import xyz.mcutils.backend.service.PlayerService; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/xyz/mcutils/backend/controller/ServerController.java b/src/main/java/xyz/mcutils/backend/controller/ServerController.java index 578c88b..81d490c 100644 --- a/src/main/java/xyz/mcutils/backend/controller/ServerController.java +++ b/src/main/java/xyz/mcutils/backend/controller/ServerController.java @@ -1,8 +1,5 @@ -package cc.fascinated.controller; +package xyz.mcutils.backend.controller; -import cc.fascinated.model.cache.CachedMinecraftServer; -import xyz.mcutils.backend.service.MojangService; -import xyz.mcutils.backend.service.ServerService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +7,9 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import xyz.mcutils.backend.model.cache.CachedMinecraftServer; +import xyz.mcutils.backend.service.MojangService; +import xyz.mcutils.backend.service.ServerService; import java.util.Map; diff --git a/src/main/java/xyz/mcutils/backend/exception/ExceptionControllerAdvice.java b/src/main/java/xyz/mcutils/backend/exception/ExceptionControllerAdvice.java index 74de241..d16fd46 100644 --- a/src/main/java/xyz/mcutils/backend/exception/ExceptionControllerAdvice.java +++ b/src/main/java/xyz/mcutils/backend/exception/ExceptionControllerAdvice.java @@ -1,6 +1,5 @@ -package cc.fascinated.exception; +package xyz.mcutils.backend.exception; -import cc.fascinated.model.response.ErrorResponse; import io.micrometer.common.lang.NonNull; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -8,6 +7,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.servlet.resource.NoResourceFoundException; +import xyz.mcutils.backend.model.response.ErrorResponse; @ControllerAdvice public final class ExceptionControllerAdvice { diff --git a/src/main/java/xyz/mcutils/backend/exception/impl/BadRequestException.java b/src/main/java/xyz/mcutils/backend/exception/impl/BadRequestException.java index 9d96eb2..1375c27 100644 --- a/src/main/java/xyz/mcutils/backend/exception/impl/BadRequestException.java +++ b/src/main/java/xyz/mcutils/backend/exception/impl/BadRequestException.java @@ -1,4 +1,4 @@ -package cc.fascinated.exception.impl; +package xyz.mcutils.backend.exception.impl; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/xyz/mcutils/backend/exception/impl/InternalServerErrorException.java b/src/main/java/xyz/mcutils/backend/exception/impl/InternalServerErrorException.java index 0d439f2..d5b349c 100644 --- a/src/main/java/xyz/mcutils/backend/exception/impl/InternalServerErrorException.java +++ b/src/main/java/xyz/mcutils/backend/exception/impl/InternalServerErrorException.java @@ -1,4 +1,4 @@ -package cc.fascinated.exception.impl; +package xyz.mcutils.backend.exception.impl; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/xyz/mcutils/backend/exception/impl/MojangAPIRateLimitException.java b/src/main/java/xyz/mcutils/backend/exception/impl/MojangAPIRateLimitException.java index 6c2535a..b426622 100644 --- a/src/main/java/xyz/mcutils/backend/exception/impl/MojangAPIRateLimitException.java +++ b/src/main/java/xyz/mcutils/backend/exception/impl/MojangAPIRateLimitException.java @@ -1,4 +1,4 @@ -package cc.fascinated.exception.impl; +package xyz.mcutils.backend.exception.impl; public class MojangAPIRateLimitException extends RateLimitException { diff --git a/src/main/java/xyz/mcutils/backend/exception/impl/RateLimitException.java b/src/main/java/xyz/mcutils/backend/exception/impl/RateLimitException.java index 4403181..93a1cb8 100644 --- a/src/main/java/xyz/mcutils/backend/exception/impl/RateLimitException.java +++ b/src/main/java/xyz/mcutils/backend/exception/impl/RateLimitException.java @@ -1,4 +1,4 @@ -package cc.fascinated.exception.impl; +package xyz.mcutils.backend.exception.impl; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/xyz/mcutils/backend/exception/impl/ResourceNotFoundException.java b/src/main/java/xyz/mcutils/backend/exception/impl/ResourceNotFoundException.java index a4f0003..7ed84a3 100644 --- a/src/main/java/xyz/mcutils/backend/exception/impl/ResourceNotFoundException.java +++ b/src/main/java/xyz/mcutils/backend/exception/impl/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package cc.fascinated.exception.impl; +package xyz.mcutils.backend.exception.impl; import lombok.experimental.StandardException; import org.springframework.http.HttpStatus; diff --git a/src/main/java/xyz/mcutils/backend/log/TransactionLogger.java b/src/main/java/xyz/mcutils/backend/log/TransactionLogger.java index bda1f3c..e971d6a 100644 --- a/src/main/java/xyz/mcutils/backend/log/TransactionLogger.java +++ b/src/main/java/xyz/mcutils/backend/log/TransactionLogger.java @@ -1,6 +1,5 @@ -package cc.fascinated.log; +package xyz.mcutils.backend.log; -import cc.fascinated.common.IPUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; @@ -12,6 +11,7 @@ import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; +import xyz.mcutils.backend.common.IPUtils; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/xyz/mcutils/backend/model/cache/CachedEndpointStatus.java b/src/main/java/xyz/mcutils/backend/model/cache/CachedEndpointStatus.java index c9df8e9..b6e8fe8 100644 --- a/src/main/java/xyz/mcutils/backend/model/cache/CachedEndpointStatus.java +++ b/src/main/java/xyz/mcutils/backend/model/cache/CachedEndpointStatus.java @@ -1,10 +1,10 @@ -package cc.fascinated.model.cache; +package xyz.mcutils.backend.model.cache; -import cc.fascinated.common.CachedResponse; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; +import xyz.mcutils.backend.common.CachedResponse; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/xyz/mcutils/backend/model/cache/CachedMinecraftServer.java b/src/main/java/xyz/mcutils/backend/model/cache/CachedMinecraftServer.java index 5a10ea0..6216074 100644 --- a/src/main/java/xyz/mcutils/backend/model/cache/CachedMinecraftServer.java +++ b/src/main/java/xyz/mcutils/backend/model/cache/CachedMinecraftServer.java @@ -1,11 +1,11 @@ -package cc.fascinated.model.cache; +package xyz.mcutils.backend.model.cache; -import cc.fascinated.common.CachedResponse; -import cc.fascinated.model.server.MinecraftServer; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; +import xyz.mcutils.backend.common.CachedResponse; +import xyz.mcutils.backend.model.server.MinecraftServer; import java.io.Serializable; @@ -29,7 +29,7 @@ public class CachedMinecraftServer extends CachedResponse implements Serializabl private MinecraftServer server; public CachedMinecraftServer(@NonNull String id, @NonNull MinecraftServer server) { - super(Cache.defaultCache()); + super(CachedResponse.Cache.defaultCache()); this.id = id; this.server = server; } diff --git a/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayer.java b/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayer.java index 2f47cbc..ebfb867 100644 --- a/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayer.java +++ b/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayer.java @@ -1,13 +1,13 @@ -package cc.fascinated.model.cache; +package xyz.mcutils.backend.model.cache; -import cc.fascinated.common.CachedResponse; -import cc.fascinated.model.player.Player; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; +import xyz.mcutils.backend.common.CachedResponse; +import xyz.mcutils.backend.model.player.Player; import java.io.Serializable; import java.util.UUID; diff --git a/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerName.java b/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerName.java index 2382565..344d68e 100644 --- a/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerName.java +++ b/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerName.java @@ -1,11 +1,11 @@ -package cc.fascinated.model.cache; +package xyz.mcutils.backend.model.cache; -import cc.fascinated.common.CachedResponse; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.ToString; import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; +import xyz.mcutils.backend.common.CachedResponse; import java.util.UUID; diff --git a/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerSkinPart.java b/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerSkinPart.java index f765744..dbc507d 100644 --- a/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerSkinPart.java +++ b/src/main/java/xyz/mcutils/backend/model/cache/CachedPlayerSkinPart.java @@ -1,4 +1,4 @@ -package cc.fascinated.model.cache; +package xyz.mcutils.backend.model.cache; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/model/dns/DNSRecord.java b/src/main/java/xyz/mcutils/backend/model/dns/DNSRecord.java index 6fb4892..00c2feb 100644 --- a/src/main/java/xyz/mcutils/backend/model/dns/DNSRecord.java +++ b/src/main/java/xyz/mcutils/backend/model/dns/DNSRecord.java @@ -1,4 +1,4 @@ -package cc.fascinated.model.dns; +package xyz.mcutils.backend.model.dns; import io.micrometer.common.lang.NonNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/xyz/mcutils/backend/model/dns/impl/ARecord.java b/src/main/java/xyz/mcutils/backend/model/dns/impl/ARecord.java index cbfa379..918336f 100644 --- a/src/main/java/xyz/mcutils/backend/model/dns/impl/ARecord.java +++ b/src/main/java/xyz/mcutils/backend/model/dns/impl/ARecord.java @@ -1,10 +1,10 @@ -package cc.fascinated.model.dns.impl; +package xyz.mcutils.backend.model.dns.impl; -import cc.fascinated.model.dns.DNSRecord; import io.micrometer.common.lang.NonNull; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import xyz.mcutils.backend.model.dns.DNSRecord; import java.net.InetAddress; diff --git a/src/main/java/xyz/mcutils/backend/model/dns/impl/SRVRecord.java b/src/main/java/xyz/mcutils/backend/model/dns/impl/SRVRecord.java index fe4f320..d4b2089 100644 --- a/src/main/java/xyz/mcutils/backend/model/dns/impl/SRVRecord.java +++ b/src/main/java/xyz/mcutils/backend/model/dns/impl/SRVRecord.java @@ -1,11 +1,11 @@ -package cc.fascinated.model.dns.impl; +package xyz.mcutils.backend.model.dns.impl; -import cc.fascinated.model.dns.DNSRecord; import com.fasterxml.jackson.annotation.JsonIgnore; import io.micrometer.common.lang.NonNull; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import xyz.mcutils.backend.model.dns.DNSRecord; import java.net.InetSocketAddress; diff --git a/src/main/java/xyz/mcutils/backend/model/player/Cape.java b/src/main/java/xyz/mcutils/backend/model/player/Cape.java index cb26d0a..b4dd64a 100644 --- a/src/main/java/xyz/mcutils/backend/model/player/Cape.java +++ b/src/main/java/xyz/mcutils/backend/model/player/Cape.java @@ -1,4 +1,4 @@ -package cc.fascinated.model.player; +package xyz.mcutils.backend.model.player; import com.google.gson.JsonObject; import lombok.AllArgsConstructor; diff --git a/src/main/java/xyz/mcutils/backend/model/player/Player.java b/src/main/java/xyz/mcutils/backend/model/player/Player.java index aa27655..226fce4 100644 --- a/src/main/java/xyz/mcutils/backend/model/player/Player.java +++ b/src/main/java/xyz/mcutils/backend/model/player/Player.java @@ -1,12 +1,12 @@ -package cc.fascinated.model.player; +package xyz.mcutils.backend.model.player; -import cc.fascinated.common.Tuple; -import cc.fascinated.common.UUIDUtils; -import cc.fascinated.model.skin.Skin; -import cc.fascinated.model.token.MojangProfileToken; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import xyz.mcutils.backend.common.Tuple; +import xyz.mcutils.backend.common.UUIDUtils; +import xyz.mcutils.backend.model.skin.Skin; +import xyz.mcutils.backend.model.token.MojangProfileToken; import java.util.UUID; diff --git a/src/main/java/xyz/mcutils/backend/model/response/ErrorResponse.java b/src/main/java/xyz/mcutils/backend/model/response/ErrorResponse.java index 4ff3196..ef84471 100644 --- a/src/main/java/xyz/mcutils/backend/model/response/ErrorResponse.java +++ b/src/main/java/xyz/mcutils/backend/model/response/ErrorResponse.java @@ -1,4 +1,4 @@ -package cc.fascinated.model.response; +package xyz.mcutils.backend.model.response; import io.micrometer.common.lang.NonNull; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/model/server/BedrockMinecraftServer.java b/src/main/java/xyz/mcutils/backend/model/server/BedrockMinecraftServer.java index b010b95..a969ac3 100644 --- a/src/main/java/xyz/mcutils/backend/model/server/BedrockMinecraftServer.java +++ b/src/main/java/xyz/mcutils/backend/model/server/BedrockMinecraftServer.java @@ -1,7 +1,7 @@ -package cc.fascinated.model.server; +package xyz.mcutils.backend.model.server; -import cc.fascinated.model.dns.DNSRecord; import lombok.*; +import xyz.mcutils.backend.model.dns.DNSRecord; /** * A Bedrock edition {@link MinecraftServer}. diff --git a/src/main/java/xyz/mcutils/backend/model/server/JavaMinecraftServer.java b/src/main/java/xyz/mcutils/backend/model/server/JavaMinecraftServer.java index 0141f7c..6e28e8d 100644 --- a/src/main/java/xyz/mcutils/backend/model/server/JavaMinecraftServer.java +++ b/src/main/java/xyz/mcutils/backend/model/server/JavaMinecraftServer.java @@ -1,15 +1,15 @@ -package cc.fascinated.model.server; +package xyz.mcutils.backend.model.server; -import xyz.mcutils.backend.Main; -import cc.fascinated.common.JavaMinecraftVersion; -import cc.fascinated.common.ServerUtils; -import cc.fascinated.config.Config; -import cc.fascinated.model.dns.DNSRecord; -import cc.fascinated.model.token.JavaServerStatusToken; import com.google.gson.annotations.SerializedName; import lombok.*; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.chat.ComponentSerializer; +import xyz.mcutils.backend.Main; +import xyz.mcutils.backend.common.JavaMinecraftVersion; +import xyz.mcutils.backend.common.ServerUtils; +import xyz.mcutils.backend.config.Config; +import xyz.mcutils.backend.model.dns.DNSRecord; +import xyz.mcutils.backend.model.token.JavaServerStatusToken; /** * @author Braydon diff --git a/src/main/java/xyz/mcutils/backend/model/server/MinecraftServer.java b/src/main/java/xyz/mcutils/backend/model/server/MinecraftServer.java index 3cb8760..f48c069 100644 --- a/src/main/java/xyz/mcutils/backend/model/server/MinecraftServer.java +++ b/src/main/java/xyz/mcutils/backend/model/server/MinecraftServer.java @@ -1,15 +1,15 @@ -package cc.fascinated.model.server; +package xyz.mcutils.backend.model.server; -import cc.fascinated.common.ColorUtils; -import cc.fascinated.model.dns.DNSRecord; -import xyz.mcutils.backend.service.pinger.MinecraftServerPinger; -import xyz.mcutils.backend.service.pinger.impl.BedrockMinecraftServerPinger; -import xyz.mcutils.backend.service.pinger.impl.JavaMinecraftServerPinger; import io.micrometer.common.lang.NonNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import xyz.mcutils.backend.common.ColorUtils; +import xyz.mcutils.backend.model.dns.DNSRecord; +import xyz.mcutils.backend.service.pinger.MinecraftServerPinger; +import xyz.mcutils.backend.service.pinger.impl.BedrockMinecraftServerPinger; +import xyz.mcutils.backend.service.pinger.impl.JavaMinecraftServerPinger; import java.util.Arrays; import java.util.UUID; diff --git a/src/main/java/xyz/mcutils/backend/model/skin/ISkinPart.java b/src/main/java/xyz/mcutils/backend/model/skin/ISkinPart.java index 9ae5d9d..17ebca5 100644 --- a/src/main/java/xyz/mcutils/backend/model/skin/ISkinPart.java +++ b/src/main/java/xyz/mcutils/backend/model/skin/ISkinPart.java @@ -1,11 +1,11 @@ -package cc.fascinated.model.skin; +package xyz.mcutils.backend.model.skin; -import cc.fascinated.common.renderer.SkinRenderer; -import cc.fascinated.common.renderer.impl.BodyRenderer; -import cc.fascinated.common.renderer.impl.IsometricHeadRenderer; -import cc.fascinated.common.renderer.impl.SquareRenderer; import lombok.AllArgsConstructor; import lombok.Getter; +import xyz.mcutils.backend.common.renderer.SkinRenderer; +import xyz.mcutils.backend.common.renderer.impl.BodyRenderer; +import xyz.mcutils.backend.common.renderer.impl.IsometricHeadRenderer; +import xyz.mcutils.backend.common.renderer.impl.SquareRenderer; import java.awt.image.BufferedImage; diff --git a/src/main/java/xyz/mcutils/backend/model/skin/Skin.java b/src/main/java/xyz/mcutils/backend/model/skin/Skin.java index 129859c..2726c36 100644 --- a/src/main/java/xyz/mcutils/backend/model/skin/Skin.java +++ b/src/main/java/xyz/mcutils/backend/model/skin/Skin.java @@ -1,8 +1,5 @@ -package cc.fascinated.model.skin; +package xyz.mcutils.backend.model.skin; -import cc.fascinated.common.EnumUtils; -import cc.fascinated.common.PlayerUtils; -import cc.fascinated.config.Config; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.JsonObject; @@ -10,6 +7,9 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.common.EnumUtils; +import xyz.mcutils.backend.common.PlayerUtils; +import xyz.mcutils.backend.config.Config; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/xyz/mcutils/backend/model/token/JavaServerStatusToken.java b/src/main/java/xyz/mcutils/backend/model/token/JavaServerStatusToken.java index ff0ddd0..c75d463 100644 --- a/src/main/java/xyz/mcutils/backend/model/token/JavaServerStatusToken.java +++ b/src/main/java/xyz/mcutils/backend/model/token/JavaServerStatusToken.java @@ -1,11 +1,11 @@ -package cc.fascinated.model.token; +package xyz.mcutils.backend.model.token; -import cc.fascinated.model.server.JavaMinecraftServer; -import cc.fascinated.model.server.MinecraftServer; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; +import xyz.mcutils.backend.model.server.JavaMinecraftServer; +import xyz.mcutils.backend.model.server.MinecraftServer; /** * @author Braydon diff --git a/src/main/java/xyz/mcutils/backend/model/token/MojangProfileToken.java b/src/main/java/xyz/mcutils/backend/model/token/MojangProfileToken.java index 481c296..b600034 100644 --- a/src/main/java/xyz/mcutils/backend/model/token/MojangProfileToken.java +++ b/src/main/java/xyz/mcutils/backend/model/token/MojangProfileToken.java @@ -1,15 +1,15 @@ -package cc.fascinated.model.token; +package xyz.mcutils.backend.model.token; -import xyz.mcutils.backend.Main; -import cc.fascinated.common.Tuple; -import cc.fascinated.common.UUIDUtils; -import cc.fascinated.model.player.Cape; -import cc.fascinated.model.skin.Skin; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.gson.JsonObject; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import xyz.mcutils.backend.Main; +import xyz.mcutils.backend.common.Tuple; +import xyz.mcutils.backend.common.UUIDUtils; +import xyz.mcutils.backend.model.player.Cape; +import xyz.mcutils.backend.model.skin.Skin; import java.util.Base64; diff --git a/src/main/java/xyz/mcutils/backend/model/token/MojangUsernameToUuidToken.java b/src/main/java/xyz/mcutils/backend/model/token/MojangUsernameToUuidToken.java index a9e1c18..17c9b13 100644 --- a/src/main/java/xyz/mcutils/backend/model/token/MojangUsernameToUuidToken.java +++ b/src/main/java/xyz/mcutils/backend/model/token/MojangUsernameToUuidToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.model.token; +package xyz.mcutils.backend.model.token; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/xyz/mcutils/backend/repository/EndpointStatusRepository.java b/src/main/java/xyz/mcutils/backend/repository/EndpointStatusRepository.java index d630c40..2645841 100644 --- a/src/main/java/xyz/mcutils/backend/repository/EndpointStatusRepository.java +++ b/src/main/java/xyz/mcutils/backend/repository/EndpointStatusRepository.java @@ -1,7 +1,7 @@ package xyz.mcutils.backend.repository; -import cc.fascinated.model.cache.CachedEndpointStatus; import org.springframework.data.repository.CrudRepository; +import xyz.mcutils.backend.model.cache.CachedEndpointStatus; /** * A cache repository for {@link CachedEndpointStatus}'s. diff --git a/src/main/java/xyz/mcutils/backend/repository/MinecraftServerCacheRepository.java b/src/main/java/xyz/mcutils/backend/repository/MinecraftServerCacheRepository.java index c0f1fe2..2fc8500 100644 --- a/src/main/java/xyz/mcutils/backend/repository/MinecraftServerCacheRepository.java +++ b/src/main/java/xyz/mcutils/backend/repository/MinecraftServerCacheRepository.java @@ -1,7 +1,7 @@ package xyz.mcutils.backend.repository; -import cc.fascinated.model.cache.CachedMinecraftServer; import org.springframework.data.repository.CrudRepository; +import xyz.mcutils.backend.model.cache.CachedMinecraftServer; /** * A cache repository for {@link CachedMinecraftServer}'s. diff --git a/src/main/java/xyz/mcutils/backend/repository/PlayerCacheRepository.java b/src/main/java/xyz/mcutils/backend/repository/PlayerCacheRepository.java index 678222f..e28d11b 100644 --- a/src/main/java/xyz/mcutils/backend/repository/PlayerCacheRepository.java +++ b/src/main/java/xyz/mcutils/backend/repository/PlayerCacheRepository.java @@ -1,7 +1,7 @@ package xyz.mcutils.backend.repository; -import cc.fascinated.model.cache.CachedPlayer; import org.springframework.data.repository.CrudRepository; +import xyz.mcutils.backend.model.cache.CachedPlayer; import java.util.UUID; diff --git a/src/main/java/xyz/mcutils/backend/repository/PlayerNameCacheRepository.java b/src/main/java/xyz/mcutils/backend/repository/PlayerNameCacheRepository.java index 48527bb..1ff899f 100644 --- a/src/main/java/xyz/mcutils/backend/repository/PlayerNameCacheRepository.java +++ b/src/main/java/xyz/mcutils/backend/repository/PlayerNameCacheRepository.java @@ -1,7 +1,7 @@ package xyz.mcutils.backend.repository; -import cc.fascinated.model.cache.CachedPlayerName; import org.springframework.data.repository.CrudRepository; +import xyz.mcutils.backend.model.cache.CachedPlayerName; /** * A cache repository for player usernames. diff --git a/src/main/java/xyz/mcutils/backend/repository/PlayerSkinPartCacheRepository.java b/src/main/java/xyz/mcutils/backend/repository/PlayerSkinPartCacheRepository.java index bddea30..a2dbb0a 100644 --- a/src/main/java/xyz/mcutils/backend/repository/PlayerSkinPartCacheRepository.java +++ b/src/main/java/xyz/mcutils/backend/repository/PlayerSkinPartCacheRepository.java @@ -1,7 +1,7 @@ package xyz.mcutils.backend.repository; -import cc.fascinated.model.cache.CachedPlayerSkinPart; import org.springframework.data.repository.CrudRepository; +import xyz.mcutils.backend.model.cache.CachedPlayerSkinPart; /** * A cache repository for player skin parts. diff --git a/src/main/java/xyz/mcutils/backend/service/MojangService.java b/src/main/java/xyz/mcutils/backend/service/MojangService.java index 65f96e5..36b73f9 100644 --- a/src/main/java/xyz/mcutils/backend/service/MojangService.java +++ b/src/main/java/xyz/mcutils/backend/service/MojangService.java @@ -1,14 +1,5 @@ package xyz.mcutils.backend.service; -import xyz.mcutils.backend.Main; -import cc.fascinated.common.EndpointStatus; -import cc.fascinated.common.ExpiringSet; -import cc.fascinated.common.WebRequest; -import cc.fascinated.config.Config; -import cc.fascinated.model.cache.CachedEndpointStatus; -import cc.fascinated.model.token.MojangProfileToken; -import cc.fascinated.model.token.MojangUsernameToUuidToken; -import xyz.mcutils.backend.repository.EndpointStatusRepository; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Lists; @@ -22,6 +13,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import xyz.mcutils.backend.Main; +import xyz.mcutils.backend.common.EndpointStatus; +import xyz.mcutils.backend.common.ExpiringSet; +import xyz.mcutils.backend.common.WebRequest; +import xyz.mcutils.backend.config.Config; +import xyz.mcutils.backend.model.cache.CachedEndpointStatus; +import xyz.mcutils.backend.model.token.MojangProfileToken; +import xyz.mcutils.backend.model.token.MojangUsernameToUuidToken; +import xyz.mcutils.backend.repository.EndpointStatusRepository; import java.io.InputStream; import java.net.URL; diff --git a/src/main/java/xyz/mcutils/backend/service/PlayerService.java b/src/main/java/xyz/mcutils/backend/service/PlayerService.java index 793a0e2..7328c9f 100644 --- a/src/main/java/xyz/mcutils/backend/service/PlayerService.java +++ b/src/main/java/xyz/mcutils/backend/service/PlayerService.java @@ -1,29 +1,29 @@ package xyz.mcutils.backend.service; -import cc.fascinated.common.ImageUtils; -import cc.fascinated.common.PlayerUtils; -import cc.fascinated.common.Tuple; -import cc.fascinated.common.UUIDUtils; -import cc.fascinated.config.Config; -import cc.fascinated.exception.impl.BadRequestException; -import cc.fascinated.exception.impl.MojangAPIRateLimitException; -import cc.fascinated.exception.impl.RateLimitException; -import cc.fascinated.exception.impl.ResourceNotFoundException; -import cc.fascinated.model.cache.CachedPlayer; -import cc.fascinated.model.cache.CachedPlayerName; -import cc.fascinated.model.cache.CachedPlayerSkinPart; -import cc.fascinated.model.player.Cape; -import cc.fascinated.model.player.Player; -import cc.fascinated.model.skin.ISkinPart; -import cc.fascinated.model.skin.Skin; -import cc.fascinated.model.token.MojangProfileToken; -import cc.fascinated.model.token.MojangUsernameToUuidToken; -import xyz.mcutils.backend.repository.PlayerCacheRepository; -import xyz.mcutils.backend.repository.PlayerNameCacheRepository; -import xyz.mcutils.backend.repository.PlayerSkinPartCacheRepository; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import xyz.mcutils.backend.common.ImageUtils; +import xyz.mcutils.backend.common.PlayerUtils; +import xyz.mcutils.backend.common.Tuple; +import xyz.mcutils.backend.common.UUIDUtils; +import xyz.mcutils.backend.config.Config; +import xyz.mcutils.backend.exception.impl.BadRequestException; +import xyz.mcutils.backend.exception.impl.MojangAPIRateLimitException; +import xyz.mcutils.backend.exception.impl.RateLimitException; +import xyz.mcutils.backend.exception.impl.ResourceNotFoundException; +import xyz.mcutils.backend.model.cache.CachedPlayer; +import xyz.mcutils.backend.model.cache.CachedPlayerName; +import xyz.mcutils.backend.model.cache.CachedPlayerSkinPart; +import xyz.mcutils.backend.model.player.Cape; +import xyz.mcutils.backend.model.player.Player; +import xyz.mcutils.backend.model.skin.ISkinPart; +import xyz.mcutils.backend.model.skin.Skin; +import xyz.mcutils.backend.model.token.MojangProfileToken; +import xyz.mcutils.backend.model.token.MojangUsernameToUuidToken; +import xyz.mcutils.backend.repository.PlayerCacheRepository; +import xyz.mcutils.backend.repository.PlayerNameCacheRepository; +import xyz.mcutils.backend.repository.PlayerSkinPartCacheRepository; import java.awt.image.BufferedImage; import java.util.Optional; diff --git a/src/main/java/xyz/mcutils/backend/service/ServerService.java b/src/main/java/xyz/mcutils/backend/service/ServerService.java index 347f5c5..8890dfb 100644 --- a/src/main/java/xyz/mcutils/backend/service/ServerService.java +++ b/src/main/java/xyz/mcutils/backend/service/ServerService.java @@ -1,20 +1,20 @@ package xyz.mcutils.backend.service; -import cc.fascinated.common.DNSUtils; -import cc.fascinated.common.EnumUtils; -import cc.fascinated.config.Config; -import cc.fascinated.exception.impl.BadRequestException; -import cc.fascinated.exception.impl.ResourceNotFoundException; -import cc.fascinated.model.cache.CachedMinecraftServer; -import cc.fascinated.model.dns.DNSRecord; -import cc.fascinated.model.dns.impl.ARecord; -import cc.fascinated.model.dns.impl.SRVRecord; -import cc.fascinated.model.server.JavaMinecraftServer; -import cc.fascinated.model.server.MinecraftServer; -import xyz.mcutils.backend.repository.MinecraftServerCacheRepository; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import xyz.mcutils.backend.common.DNSUtils; +import xyz.mcutils.backend.common.EnumUtils; +import xyz.mcutils.backend.config.Config; +import xyz.mcutils.backend.exception.impl.BadRequestException; +import xyz.mcutils.backend.exception.impl.ResourceNotFoundException; +import xyz.mcutils.backend.model.cache.CachedMinecraftServer; +import xyz.mcutils.backend.model.dns.DNSRecord; +import xyz.mcutils.backend.model.dns.impl.ARecord; +import xyz.mcutils.backend.model.dns.impl.SRVRecord; +import xyz.mcutils.backend.model.server.JavaMinecraftServer; +import xyz.mcutils.backend.model.server.MinecraftServer; +import xyz.mcutils.backend.repository.MinecraftServerCacheRepository; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/src/main/java/xyz/mcutils/backend/service/pinger/MinecraftServerPinger.java b/src/main/java/xyz/mcutils/backend/service/pinger/MinecraftServerPinger.java index 5721c3d..09135c6 100644 --- a/src/main/java/xyz/mcutils/backend/service/pinger/MinecraftServerPinger.java +++ b/src/main/java/xyz/mcutils/backend/service/pinger/MinecraftServerPinger.java @@ -1,7 +1,7 @@ package xyz.mcutils.backend.service.pinger; -import cc.fascinated.model.dns.DNSRecord; -import cc.fascinated.model.server.MinecraftServer; +import xyz.mcutils.backend.model.dns.DNSRecord; +import xyz.mcutils.backend.model.server.MinecraftServer; /** * @author Braydon diff --git a/src/main/java/xyz/mcutils/backend/service/pinger/impl/BedrockMinecraftServerPinger.java b/src/main/java/xyz/mcutils/backend/service/pinger/impl/BedrockMinecraftServerPinger.java index e56dbf6..6073681 100644 --- a/src/main/java/xyz/mcutils/backend/service/pinger/impl/BedrockMinecraftServerPinger.java +++ b/src/main/java/xyz/mcutils/backend/service/pinger/impl/BedrockMinecraftServerPinger.java @@ -1,13 +1,13 @@ package xyz.mcutils.backend.service.pinger.impl; -import cc.fascinated.common.packet.impl.bedrock.BedrockPacketUnconnectedPing; -import cc.fascinated.common.packet.impl.bedrock.BedrockPacketUnconnectedPong; -import cc.fascinated.exception.impl.BadRequestException; -import cc.fascinated.exception.impl.ResourceNotFoundException; -import cc.fascinated.model.dns.DNSRecord; -import cc.fascinated.model.server.BedrockMinecraftServer; -import xyz.mcutils.backend.service.pinger.MinecraftServerPinger; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.common.packet.impl.bedrock.BedrockPacketUnconnectedPing; +import xyz.mcutils.backend.common.packet.impl.bedrock.BedrockPacketUnconnectedPong; +import xyz.mcutils.backend.exception.impl.BadRequestException; +import xyz.mcutils.backend.exception.impl.ResourceNotFoundException; +import xyz.mcutils.backend.model.dns.DNSRecord; +import xyz.mcutils.backend.model.server.BedrockMinecraftServer; +import xyz.mcutils.backend.service.pinger.MinecraftServerPinger; import java.io.IOException; import java.net.DatagramSocket; diff --git a/src/main/java/xyz/mcutils/backend/service/pinger/impl/JavaMinecraftServerPinger.java b/src/main/java/xyz/mcutils/backend/service/pinger/impl/JavaMinecraftServerPinger.java index ed708df..987130a 100644 --- a/src/main/java/xyz/mcutils/backend/service/pinger/impl/JavaMinecraftServerPinger.java +++ b/src/main/java/xyz/mcutils/backend/service/pinger/impl/JavaMinecraftServerPinger.java @@ -1,17 +1,17 @@ package xyz.mcutils.backend.service.pinger.impl; -import xyz.mcutils.backend.Main; -import cc.fascinated.common.JavaMinecraftVersion; -import cc.fascinated.common.ServerUtils; -import cc.fascinated.common.packet.impl.java.JavaPacketHandshakingInSetProtocol; -import cc.fascinated.common.packet.impl.java.JavaPacketStatusInStart; -import cc.fascinated.exception.impl.BadRequestException; -import cc.fascinated.exception.impl.ResourceNotFoundException; -import cc.fascinated.model.dns.DNSRecord; -import cc.fascinated.model.server.JavaMinecraftServer; -import cc.fascinated.model.token.JavaServerStatusToken; -import xyz.mcutils.backend.service.pinger.MinecraftServerPinger; import lombok.extern.log4j.Log4j2; +import xyz.mcutils.backend.Main; +import xyz.mcutils.backend.common.JavaMinecraftVersion; +import xyz.mcutils.backend.common.ServerUtils; +import xyz.mcutils.backend.common.packet.impl.java.JavaPacketHandshakingInSetProtocol; +import xyz.mcutils.backend.common.packet.impl.java.JavaPacketStatusInStart; +import xyz.mcutils.backend.exception.impl.BadRequestException; +import xyz.mcutils.backend.exception.impl.ResourceNotFoundException; +import xyz.mcutils.backend.model.dns.DNSRecord; +import xyz.mcutils.backend.model.server.JavaMinecraftServer; +import xyz.mcutils.backend.model.token.JavaServerStatusToken; +import xyz.mcutils.backend.service.pinger.MinecraftServerPinger; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/test/java/cc/fascinated/tests/MojangControllerTests.java b/src/test/java/xyz/mcutils/backend/tests/MojangControllerTests.java similarity index 96% rename from src/test/java/cc/fascinated/tests/MojangControllerTests.java rename to src/test/java/xyz/mcutils/backend/tests/MojangControllerTests.java index 6b195b0..5db6d0f 100644 --- a/src/test/java/cc/fascinated/tests/MojangControllerTests.java +++ b/src/test/java/xyz/mcutils/backend/tests/MojangControllerTests.java @@ -1,4 +1,4 @@ -package cc.fascinated.tests; +package xyz.mcutils.backend.tests; import cc.fascinated.config.TestRedisConfig; import org.junit.jupiter.api.Test; diff --git a/src/test/java/cc/fascinated/tests/PlayerControllerTests.java b/src/test/java/xyz/mcutils/backend/tests/PlayerControllerTests.java similarity index 99% rename from src/test/java/cc/fascinated/tests/PlayerControllerTests.java rename to src/test/java/xyz/mcutils/backend/tests/PlayerControllerTests.java index 2a62bae..c53453f 100644 --- a/src/test/java/cc/fascinated/tests/PlayerControllerTests.java +++ b/src/test/java/xyz/mcutils/backend/tests/PlayerControllerTests.java @@ -1,4 +1,4 @@ -package cc.fascinated.tests; +package xyz.mcutils.backend.tests; import cc.fascinated.config.TestRedisConfig; import cc.fascinated.model.skin.ISkinPart; diff --git a/src/test/java/cc/fascinated/tests/ServerControllerTests.java b/src/test/java/xyz/mcutils/backend/tests/ServerControllerTests.java similarity index 98% rename from src/test/java/cc/fascinated/tests/ServerControllerTests.java rename to src/test/java/xyz/mcutils/backend/tests/ServerControllerTests.java index ea70c10..6177f91 100644 --- a/src/test/java/cc/fascinated/tests/ServerControllerTests.java +++ b/src/test/java/xyz/mcutils/backend/tests/ServerControllerTests.java @@ -1,4 +1,4 @@ -package cc.fascinated.tests; +package xyz.mcutils.backend.tests; import cc.fascinated.config.TestRedisConfig; import org.junit.jupiter.api.Test;