Attempt migration to hypixel-data dependency

HypixelDev · Jul 18, 2024 · 4cc83ba · 4cc83ba
1 parent d9abe68
commit 4cc83ba
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 176 deletions.
diff --git a/hypixel-api-core/pom.xml b/hypixel-api-core/pom.xml
@@ -17,6 +17,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>net.hypixel</groupId>
+            <artifactId>hypixel-data</artifactId>
+            <version>0.1.2</version>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java
@@ -1,7 +1,7 @@
 package net.hypixel.api.adapters;
 
 import com.google.gson.*;
-import net.hypixel.api.data.type.GameType;
+import net.hypixel.data.type.GameType;
 
 import java.lang.reflect.Type;
 
@@ -19,12 +19,12 @@ public JsonElement serialize(GameType src, Type typeOfSrc, JsonSerializationCont
     @Override
     public GameType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         if (json.isJsonPrimitive() && json.getAsJsonPrimitive().isNumber()) {
-            return GameType.fromId(json.getAsInt());
+            return GameType.getById(json.getAsInt()).orElse(null);
         }
 
         String raw = json.getAsString();
         try {
-            return GameType.fromId(Integer.parseInt(raw));
+            return GameType.getById(Integer.parseInt(raw)).orElse(null);
         } catch (NumberFormatException ignored) {
         }
 
@@ -33,6 +33,11 @@ public GameType deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
         } catch (IllegalArgumentException ignored) {
         }
 
+        try {
+            return GameType.getByDatabaseName(raw).orElse(null);
+        } catch (IllegalArgumentException ignored) {
+        }
+
         return null;
     }
 

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java
@@ -1,8 +1,8 @@
 package net.hypixel.api.adapters;
 
 import com.google.gson.*;
-import net.hypixel.api.data.type.GameType;
-import net.hypixel.api.data.type.ServerType;
+import net.hypixel.data.type.GameType;
+import net.hypixel.data.type.ServerType;
 
 import java.lang.reflect.Type;
 
@@ -17,10 +17,10 @@ public JsonElement serialize(ServerType src, Type typeOfSrc, JsonSerializationCo
     public ServerType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         String raw = json.getAsString();
         try {
-            return GameType.fromId(Integer.parseInt(raw));
+            return GameType.getById(Integer.parseInt(raw)).orElse(null);
         } catch (NumberFormatException ignored) {
         }
-        return ServerType.valueOf(raw);
+        return ServerType.valueOf(raw).orElse(null);
     }
 
 }
diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/data/type/GameType.java b/hypixel-api-core/src/main/java/net/hypixel/api/data/type/GameType.java
diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/data/type/LobbyType.java b/hypixel-api-core/src/main/java/net/hypixel/api/data/type/LobbyType.java
diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/data/type/ServerType.java b/hypixel-api-core/src/main/java/net/hypixel/api/data/type/ServerType.java
diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/BoostersReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/BoostersReply.java
@@ -1,6 +1,6 @@
 package net.hypixel.api.reply;
 
-import net.hypixel.api.data.type.GameType;
+import net.hypixel.data.type.GameType;
 
 import java.time.ZonedDateTime;
 import java.util.List;

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/GuildReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/GuildReply.java
@@ -1,10 +1,10 @@
 package net.hypixel.api.reply;
 
 import com.google.gson.annotations.SerializedName;
-import net.hypixel.api.data.type.GameType;
 import net.hypixel.api.data.type.GuildAchievement;
 import net.hypixel.api.reply.PlayerReply.Player;
 import net.hypixel.api.util.Banner;
+import net.hypixel.data.type.GameType;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/LeaderboardsReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/LeaderboardsReply.java
@@ -1,6 +1,6 @@
 package net.hypixel.api.reply;
 
-import net.hypixel.api.data.type.GameType;
+import net.hypixel.data.type.GameType;
 
 import java.util.List;
 import java.util.Map;

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/PlayerReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/PlayerReply.java
@@ -5,13 +5,13 @@
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import net.hypixel.api.HypixelAPI;
-import net.hypixel.api.data.type.GameType;
 import net.hypixel.api.pets.IPetRepository;
 import net.hypixel.api.pets.PetStats;
 import net.hypixel.api.pets.impl.compatibility.BackwardsCompatibilityPetRepositoryImpl;
 import net.hypixel.api.util.ILeveling;
 import net.hypixel.api.util.UnstableHypixelObject;
 import net.hypixel.api.util.Utilities;
+import net.hypixel.data.type.GameType;
 
 import java.lang.reflect.Type;
 import java.time.ZonedDateTime;

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/RecentGamesReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/RecentGamesReply.java
@@ -1,6 +1,6 @@
 package net.hypixel.api.reply;
 
-import net.hypixel.api.data.type.GameType;
+import net.hypixel.data.type.GameType;
 
 import java.time.ZonedDateTime;
 import java.util.List;

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/StatusReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/StatusReply.java
@@ -1,7 +1,7 @@
 package net.hypixel.api.reply;
 
 import com.google.gson.annotations.SerializedName;
-import net.hypixel.api.data.type.ServerType;
+import net.hypixel.data.type.ServerType;
 
 public class StatusReply extends RateLimitedReply {
 

diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java b/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java
@@ -3,10 +3,10 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import net.hypixel.api.adapters.*;
-import net.hypixel.api.data.type.GameType;
-import net.hypixel.api.data.type.ServerType;
 import net.hypixel.api.reply.BoostersReply;
 import net.hypixel.api.reply.PlayerReply.Player;
+import net.hypixel.data.type.GameType;
+import net.hypixel.data.type.ServerType;
 
 import java.time.Instant;
 import java.time.ZoneId;

diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/example/GetGuildExample.java b/hypixel-api-example/src/main/java/net/hypixel/api/example/GetGuildExample.java
@@ -1,18 +1,19 @@
 package net.hypixel.api.example;
 
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
 import net.hypixel.api.HypixelAPI;
-import net.hypixel.api.data.type.GameType;
 import net.hypixel.api.data.type.GuildAchievement;
 import net.hypixel.api.reply.GuildReply;
 import net.hypixel.api.reply.GuildReply.Guild;
 import net.hypixel.api.reply.GuildReply.Guild.Member;
 import net.hypixel.api.reply.GuildReply.Guild.Rank;
 import net.hypixel.api.util.IGuildLeveling;
+import net.hypixel.data.type.GameType;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 /**
  * A sample app for demonstrating how guilds can be fetched & used from the Hypixel API.