From ec1a6881ced16077dc4d00715dfed0d282dde2e5 Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Tue, 30 May 2023 01:34:32 -0400
Subject: [PATCH] Fix merge import

---
 .../java/emu/grasscutter/data/GameData.java   | 61 +++++++++++++------
 .../data/excels/MonsterSpecialNameData.java   | 24 --------
 2 files changed, 43 insertions(+), 42 deletions(-)
 delete mode 100644 src/main/java/emu/grasscutter/data/excels/MonsterSpecialNameData.java

diff --git a/src/main/java/emu/grasscutter/data/GameData.java b/src/main/java/emu/grasscutter/data/GameData.java
index d3a5ed942..465991a67 100644
--- a/src/main/java/emu/grasscutter/data/GameData.java
+++ b/src/main/java/emu/grasscutter/data/GameData.java
@@ -2,35 +2,60 @@ package emu.grasscutter.data;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.binout.*;
-import emu.grasscutter.data.binout.config.*;
-import emu.grasscutter.data.binout.routes.*;
-import emu.grasscutter.data.custom.*;
+import emu.grasscutter.data.binout.config.ConfigEntityAvatar;
+import emu.grasscutter.data.binout.config.ConfigEntityGadget;
+import emu.grasscutter.data.binout.config.ConfigEntityMonster;
+import emu.grasscutter.data.binout.config.ConfigLevelEntity;
+import emu.grasscutter.data.binout.routes.Route;
+import emu.grasscutter.data.custom.TrialAvatarActivityCustomData;
+import emu.grasscutter.data.custom.TrialAvatarCustomData;
 import emu.grasscutter.data.excels.*;
-import emu.grasscutter.data.excels.achievement.*;
-import emu.grasscutter.data.excels.activity.*;
+import emu.grasscutter.data.excels.achievement.AchievementData;
+import emu.grasscutter.data.excels.achievement.AchievementGoalData;
+import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
+import emu.grasscutter.data.excels.activity.ActivityData;
+import emu.grasscutter.data.excels.activity.ActivityShopData;
+import emu.grasscutter.data.excels.activity.ActivityWatcherData;
 import emu.grasscutter.data.excels.avatar.*;
 import emu.grasscutter.data.excels.codex.*;
 import emu.grasscutter.data.excels.dungeon.*;
-import emu.grasscutter.data.excels.monster.*;
-import emu.grasscutter.data.excels.quest.*;
-import emu.grasscutter.data.excels.reliquary.*;
-import emu.grasscutter.data.excels.tower.*;
+import emu.grasscutter.data.excels.monster.MonsterCurveData;
+import emu.grasscutter.data.excels.monster.MonsterData;
+import emu.grasscutter.data.excels.monster.MonsterDescribeData;
+import emu.grasscutter.data.excels.monster.MonsterSpecialNameData;
+import emu.grasscutter.data.excels.quest.QuestData;
+import emu.grasscutter.data.excels.quest.QuestGlobalVarData;
+import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
+import emu.grasscutter.data.excels.reliquary.ReliquaryLevelData;
+import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
+import emu.grasscutter.data.excels.reliquary.ReliquarySetData;
+import emu.grasscutter.data.excels.tower.TowerFloorData;
+import emu.grasscutter.data.excels.tower.TowerLevelData;
+import emu.grasscutter.data.excels.tower.TowerScheduleData;
 import emu.grasscutter.data.excels.trial.*;
-import emu.grasscutter.data.excels.weapon.*;
-import emu.grasscutter.data.excels.world.*;
-import emu.grasscutter.data.server.*;
-import emu.grasscutter.game.dungeons.*;
-import emu.grasscutter.game.quest.*;
+import emu.grasscutter.data.excels.weapon.WeaponCurveData;
+import emu.grasscutter.data.excels.weapon.WeaponLevelData;
+import emu.grasscutter.data.excels.weapon.WeaponPromoteData;
+import emu.grasscutter.data.excels.world.WeatherData;
+import emu.grasscutter.data.excels.world.WorldAreaData;
+import emu.grasscutter.data.excels.world.WorldLevelData;
+import emu.grasscutter.data.server.ActivityCondGroup;
+import emu.grasscutter.data.server.GadgetMapping;
+import emu.grasscutter.game.dungeons.DungeonDropEntry;
+import emu.grasscutter.game.quest.QuestEncryptionKey;
+import emu.grasscutter.game.quest.RewindData;
+import emu.grasscutter.game.quest.TeleportData;
 import emu.grasscutter.game.quest.enums.QuestCond;
-import emu.grasscutter.game.world.*;
+import emu.grasscutter.game.world.GroupReplacementData;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
-import java.lang.reflect.Field;
-import java.util.*;
-import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.val;
 
+import javax.annotation.Nullable;
+import java.lang.reflect.Field;
+import java.util.*;
+
 @SuppressWarnings({"unused", "MismatchedQueryAndUpdateOfCollection"})
 public final class GameData {
     @Getter private static final Map<String, AbilityData> abilityDataMap = new HashMap<>();
diff --git a/src/main/java/emu/grasscutter/data/excels/MonsterSpecialNameData.java b/src/main/java/emu/grasscutter/data/excels/MonsterSpecialNameData.java
deleted file mode 100644
index 6ec5bf9ab..000000000
--- a/src/main/java/emu/grasscutter/data/excels/MonsterSpecialNameData.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package emu.grasscutter.data.excels;
-
-import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@ResourceType(name = "MonsterSpecialNameExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-@EqualsAndHashCode(callSuper=false)
-@Data
-public class MonsterSpecialNameData extends GameResource {
-    @SerializedName(value = "specialNameId", alternate={"specialNameID"})
-    private int specialNameId;
-    @SerializedName(value = "specialNameLabId", alternate={"specialNameLabID"})
-    private int specialNameLabId;
-    private long specialNameTextMapHash;
-
-    @Override
-    public int getId() {
-        return specialNameId;
-    }
-}
\ No newline at end of file