Revert "Fix issues with regions (#2177)" (#2178)

This reverts commit 50db3a20f5.

.github/workflows/protect_files.yml

@@ -4,6 +4,7 @@ on:
   pull_request_target:
     types:
       - opened
+      - reopened
     branches:
       - development
     paths:

README.md

@@ -80,7 +80,7 @@ Grasscutter uses Gradle to handle dependencies & building.
 ##### Windows
 
 ```shell
-git clone --recurse-submodules https://github.com/Grasscutters/Grasscutter.git
+git clone --recurse-submodules -b unstable https://github.com/Grasscutters/Grasscutter.git
 cd Grasscutter
 .\gradlew.bat # Setting up environments
 .\gradlew jar # Compile
@@ -89,7 +89,7 @@ cd Grasscutter
 ##### Linux (GNU)
 
 ```bash
-git clone --recurse-submodules https://github.com/Grasscutters/Grasscutter.git
+git clone --recurse-submodules -b unstable https://github.com/Grasscutters/Grasscutter.git
 cd Grasscutter
 chmod +x gradlew
 ./gradlew jar # Compile

build.gradle

@@ -57,7 +57,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 group = 'io.grasscutter'
-version = '1.6.1'
+version = '2.0.0-unstable'
 
 java {
     withJavadocJar()

src/main/java/emu/grasscutter/Grasscutter.java

@@ -1,11 +1,14 @@
 package emu.grasscutter;
 
+import static emu.grasscutter.config.Configuration.SERVER;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import ch.qos.logback.classic.*;
 import emu.grasscutter.auth.*;
 import emu.grasscutter.command.*;
 import emu.grasscutter.config.ConfigContainer;
 import emu.grasscutter.data.ResourceLoader;
-import emu.grasscutter.database.*;
+import emu.grasscutter.database.DatabaseManager;
 import emu.grasscutter.plugin.PluginManager;
 import emu.grasscutter.plugin.api.ServerHelper;
 import emu.grasscutter.server.dispatch.DispatchServer;
@@ -18,20 +21,16 @@ import emu.grasscutter.tools.Tools;
 import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.lang.Language;
 import io.netty.util.concurrent.FastThreadLocalThread;
+import java.io.*;
+import java.util.Calendar;
+import java.util.concurrent.*;
+import javax.annotation.Nullable;
 import lombok.*;
 import org.jline.reader.*;
 import org.jline.terminal.*;
 import org.reflections.Reflections;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
-import java.io.*;
-import java.util.Calendar;
-import java.util.concurrent.*;
-
-import static emu.grasscutter.config.Configuration.SERVER;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 public final class Grasscutter {
     public static final File configFile = new File("./config.json");
     public static final Reflections reflector = new Reflections("emu.grasscutter");
@@ -184,22 +183,6 @@ public final class Grasscutter {
     private static void onShutdown() {
         // Disable all plugins.
         if (pluginManager != null) pluginManager.disablePlugins();
-
-        try {
-            // Wait for Grasscutter's thread pool to finish.
-            var executor = Grasscutter.getThreadPool();
-            executor.shutdown();
-            if (!executor.awaitTermination(5, TimeUnit.SECONDS)) {
-                executor.shutdownNow();
-            }
-
-            // Wait for database operations to finish.
-            var dbExecutor = DatabaseHelper.getEventExecutor();
-            dbExecutor.shutdown();
-            if (!dbExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
-                dbExecutor.shutdownNow();
-            }
-        } catch (InterruptedException ignored) { }
     }
 
     /*

src/main/java/emu/grasscutter/command/commands/QuestCommand.java

@@ -1,13 +1,12 @@
 package emu.grasscutter.command.commands;
 
-import emu.grasscutter.command.*;
+import static emu.grasscutter.utils.lang.Language.translate;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.GameQuest;
-
 import java.util.List;
-import java.util.stream.Collectors;
-
-import static emu.grasscutter.utils.lang.Language.translate;
 
 @Command(
         label = "quest",
@@ -132,22 +131,6 @@ public final class QuestCommand implements CommandHandler {
                         "Triggers registered for %s: %s."
                                 .formatted(questId, String.join(", ", quest.getTriggers().keySet())));
             }
-            case "grouptriggers" -> {
-                var scene = targetPlayer.getScene();
-                var scriptManager = scene.getScriptManager();
-
-                var group = scriptManager.getGroupById(questId);
-                if (group == null) {
-                    CommandHandler.sendMessage(sender, "The group does not exist.");
-                    return;
-                }
-
-                CommandHandler.sendMessage(sender,
-                    group.triggers.entrySet().stream()
-                        .map(entry -> "%s: %s".formatted(entry.getKey(), entry.getValue()))
-                        .collect(Collectors.joining(", "))
-                );
-            }
             default -> this.sendUsageMessage(sender);
         }
     }

src/main/java/emu/grasscutter/config/ConfigContainer.java

@@ -27,11 +27,9 @@ public class ConfigContainer {
      * Version 8 - 'server' is being added for enforcing handbook server
      *             addresses.
      * Version 9 - 'limits' was added for handbook requests.
-     * Version 10 - 'trialCostumes' was added for enabling costumes
-     *              on trial avatars.
      */
     private static int version() {
-        return 10;
+        return 9;
     }
 
     /**
@@ -257,8 +255,6 @@ public class ConfigContainer {
         public boolean staminaUsage = true;
         public boolean energyUsage = true;
         public boolean fishhookTeleport = true;
-        public boolean trialCostumes = false;
-
         @SerializedName(value = "questing", alternate = "questOptions")
         public Questing questing = new Questing();
         public ResinOptions resinOptions = new ResinOptions();

src/main/java/emu/grasscutter/data/binout/AbilityData.java

@@ -87,10 +87,7 @@ public class AbilityData {
     }
 
     private void initializeModifiers() {
-        if (modifiers == null) {
+        if (modifiers == null) return;
-            this.modifiers = new HashMap<>();
-            return;
-        }
 
         var _modifiers =
                 modifiers.entrySet().stream()

src/main/java/emu/grasscutter/data/excels/TalkConfigData.java

@@ -1,11 +1,12 @@
 package emu.grasscutter.data.excels;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.*;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.talk.TalkExec;
-import lombok.*;
-
 import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @ResourceType(name = "TalkExcelConfigData.json")
 @EqualsAndHashCode(callSuper = false)
@@ -37,14 +38,6 @@ public final class TalkConfigData extends GameResource {
                 this.finishExec == null
                         ? List.of()
                         : this.finishExec.stream().filter(x -> x.getType() != null).toList();
-
-        if (this.questId <= 0) {
-            var id = String.valueOf(this.getId());
-            this.questId = Integer.parseInt(
-                id.length() < 5 ? "0" :
-                    id.substring(0, 3)
-            );
-        }
     }
 
     @Data

src/main/java/emu/grasscutter/database/DatabaseHelper.java

@@ -1,8 +1,12 @@
 package emu.grasscutter.database;
 
-import dev.morphia.query.*;
+import static com.mongodb.client.model.Filters.eq;
+
+import dev.morphia.query.FindOptions;
+import dev.morphia.query.Sort;
 import dev.morphia.query.experimental.filters.Filters;
-import emu.grasscutter.*;
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.achievement.Achievements;
 import emu.grasscutter.game.activity.PlayerActivityData;
@@ -19,16 +23,12 @@ import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.world.SceneGroupInstance;
 import emu.grasscutter.utils.objects.Returnable;
 import io.netty.util.concurrent.FastThreadLocalThread;
-import lombok.Getter;
-
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.stream.Stream;
 
-import static com.mongodb.client.model.Filters.eq;
-
 public final class DatabaseHelper {
-    @Getter private static final ExecutorService eventExecutor =
+    private static final ExecutorService eventExecutor =
             new ThreadPoolExecutor(
                     6,
                     6,

src/main/java/emu/grasscutter/game/avatar/Avatar.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.game.avatar;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 import dev.morphia.annotations.*;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.data.GameData;
@@ -30,14 +32,11 @@ import emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.TrialAvatarInfo;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-import org.bson.types.ObjectId;
-
-import javax.annotation.*;
 import java.util.*;
 import java.util.stream.Stream;
-
+import javax.annotation.*;
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+import lombok.*;
+import org.bson.types.ObjectId;
 
 @Entity(value = "avatars", useDiscriminator = false)
 public class Avatar {
@@ -1244,7 +1243,6 @@ public class Avatar {
                         });
 
         // Add costume if avatar has a costume.
-        if (GAME_OPTIONS.trialCostumes) {
         GameData.getAvatarCostumeDataItemIdMap()
                 .values()
                 .forEach(
@@ -1253,7 +1251,6 @@ public class Avatar {
                             this.setCostume(costumeData.getId());
                         });
     }
-    }
 
     /** Equips the items applied from {@link Avatar#applyTrialItems()}. */
     public void equipTrialItems() {

src/main/java/emu/grasscutter/game/entity/gadget/GadgetChest.java

@@ -75,7 +75,6 @@ public class GadgetChest extends GadgetContent {
                 } else if (chest.chest_drop_id != 0) {
                     status = dropSystem.handleChestDrop(chest.chest_drop_id, chest.drop_count, getGadget());
                 }
-
                 if (status) {
                     getGadget().updateState(ScriptGadgetState.ChestOpened);
                     player.sendPacket(

src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java

@@ -317,9 +317,7 @@ public class StaminaManager extends BasePlayerManager {
         entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
         entity.getWorld().broadcastPacket(new PacketLifeStateChangeNotify(0, entity, LifeState.LIFE_DEAD));
         player.getScene().removeEntity(entity);
-
+        ((EntityAvatar) entity).onDeath(dieType, 0);
-        if (entity instanceof EntityAvatar avatar)
-            avatar.onDeath(dieType, 0);
     }
 
     public void startSustainedStaminaHandler() {

src/main/java/emu/grasscutter/game/player/Player.java

@@ -345,9 +345,8 @@ public class Player implements PlayerHook, FieldFetch {
         this.playerGameTime = gameTime;
 
         // If the player is the host of the world, update the game time as well.
-        var world = this.getWorld();
+        if (this.getWorld().getHost() == this) {
-        if (world != null && world.getHost() == this) {
+            this.getWorld().changeTime(gameTime);
-            world.changeTime(gameTime);
         }
 
         // Trigger the script event for game time update.
@@ -708,16 +707,14 @@ public class Player implements PlayerHook, FieldFetch {
     }
 
     public void onEnterRegion(SceneRegion region) {
-        var enterRegionName = "ENTER_REGION_" + region.config_id;
         this.getQuestManager().forEachActiveQuest(quest -> {
             if (quest.getTriggerData() != null &&
-                quest.getTriggers().containsKey(enterRegionName) &&
+                quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id)) {
-                    region.getGroupId() == quest.getTriggerData().get(enterRegionName).getGroupId()) {
                 // If trigger hasn't been fired yet
-                if (!Boolean.TRUE.equals(quest.getTriggers().put(enterRegionName, true))) {
+                if (!Boolean.TRUE.equals(quest.getTriggers().put("ENTER_REGION_" + region.config_id, true))) {
                     this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
                     this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
-                        quest.getTriggerData().get(enterRegionName).getId(), 0);
+                        quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getId(), 0);
                 }
             }
         });
@@ -725,15 +722,13 @@ public class Player implements PlayerHook, FieldFetch {
     }
 
     public void onLeaveRegion(SceneRegion region) {
-        var leaveRegionName = "LEAVE_REGION_" + region.config_id;
         this.getQuestManager().forEachActiveQuest(quest -> {
-            if (quest.getTriggers().containsKey(leaveRegionName) &&
+            if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id)) {
-                region.getGroupId() == quest.getTriggerData().get(leaveRegionName).getGroupId()) {
                 // If trigger hasn't been fired yet
-                if (!Boolean.TRUE.equals(quest.getTriggers().put(leaveRegionName, true))) {
+                if (!Boolean.TRUE.equals(quest.getTriggers().put("LEAVE_REGION_" + region.config_id, true))) {
                     this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
                     this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
-                        quest.getTriggerData().get(leaveRegionName).getId(), 0);
+                        quest.getTriggerData().get("LEAVE_REGION_" + region.config_id).getId(), 0);
                 }
             }
         });

src/main/java/emu/grasscutter/game/player/TeamInfo.java

@@ -1,12 +1,12 @@
 package emu.grasscutter.game.player;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam;
-
+import java.util.ArrayList;
-import java.util.*;
+import java.util.List;
-
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
 
 @Entity
 public final class TeamInfo {
@@ -87,8 +87,6 @@ public final class TeamInfo {
 
         for (int i = 0; i < this.getAvatars().size(); i++) {
             Avatar avatar = player.getAvatars().getAvatarById(this.getAvatars().get(i));
-            if (avatar == null) continue;
-
             avatarTeam.addAvatarGuidList(avatar.getGuid());
         }
 

src/main/java/emu/grasscutter/game/quest/GameMainQuest.java

@@ -16,11 +16,10 @@ import emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest;
 import emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.ConversionUtils;
-import lombok.*;
-import org.bson.types.ObjectId;
-
 import java.util.*;
 import java.util.stream.Collectors;
+import lombok.*;
+import org.bson.types.ObjectId;
 
 @Entity(value = "quests", useDiscriminator = false)
 public class GameMainQuest {
@@ -315,7 +314,7 @@ public class GameMainQuest {
                 0, new Position(avatarPosPos.get(0), avatarPosPos.get(1), avatarPosPos.get(2))); // position
         posAndRot.add(
                 1, new Position(avatarPosRot.get(0), avatarPosRot.get(1), avatarPosRot.get(2))); // rotation
-        Grasscutter.getLogger().debug("Successfully loaded rewind data for quest {}.", subId);
+        Grasscutter.getLogger().info("Succesfully loaded rewind data for subQuest {}", subId);
         return true;
     }
 

src/main/java/emu/grasscutter/game/quest/GameQuest.java

@@ -15,10 +15,9 @@ import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.IntIntImmutablePair;
-import lombok.*;
-
-import javax.script.Bindings;
 import java.util.*;
+import javax.script.Bindings;
+import lombok.*;
 
 @Entity
 public class GameQuest {
@@ -143,7 +142,7 @@ public class GameQuest {
     }
 
     public void setFinishProgress(int index, int value) {
-        this.finishProgressList[index] = value;
+        finishProgressList[index] = value;
     }
 
     public void setFailProgress(int index, int value) {

src/main/java/emu/grasscutter/game/quest/QuestManager.java

@@ -111,9 +111,7 @@ public class QuestManager extends BasePlayerManager {
                 30700, // Quest which is responsible for unlocking Crash Course.
                 30800, // Quest which is responsible for unlocking Sparks Amongst the Pages.
 
-                47001, 47002, 47003, 47004,
+                47001, 47002, 47003, 47004
-
-                2010103, 2010144 // Prologue Act 2: Chasing Shadows
             ));
         }
     }

src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java

@@ -1,11 +1,12 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.excels.quest.QuestData;
-import emu.grasscutter.game.quest.*;
-import lombok.val;
-
 import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
 
+import emu.grasscutter.data.excels.quest.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import lombok.val;
+
 @QuestValueContent(QUEST_CONTENT_COMPLETE_TALK)
 public class ContentCompleteTalk extends BaseContent {
     @Override

src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java

@@ -53,8 +53,7 @@ public class ExecNotifyGroupLua extends QuestExecHandler {
                                     ? EventType.EVENT_QUEST_FINISH
                                     : EventType.EVENT_QUEST_START;
                     scriptManager.callEvent(
-                            new ScriptArgs(groupId, eventType, quest.getSubQuestId(),
+                            new ScriptArgs(groupId, eventType, quest.getSubQuestId())
-                                quest.getState() == QuestState.QUEST_STATE_FINISHED ? 1 : 0)
                                     .setEventSource(quest.getSubQuestId()));
                 });
 

src/main/java/emu/grasscutter/game/talk/TalkManager.java

@@ -1,13 +1,15 @@
 package emu.grasscutter.game.talk;
 
+import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
+
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.MainQuestData.TalkData;
-import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.player.BasePlayerManager;
+import emu.grasscutter.game.player.Player;
 import lombok.NonNull;
 
-import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
-import static emu.grasscutter.game.quest.enums.QuestContent.*;
-
 public final class TalkManager extends BasePlayerManager {
     public TalkManager(@NonNull Player player) {
         super(player);
@@ -20,10 +22,10 @@ public final class TalkManager extends BasePlayerManager {
      * @param npcEntityId The entity ID of the NPC being talked to.
      */
     public void triggerTalkAction(int talkId, int npcEntityId) {
-        var player = this.getPlayer();
-
         var talkData = GameData.getTalkConfigDataMap().get(talkId);
-        if (talkData != null) {
+        if (talkData == null) return;
+
+        var player = this.getPlayer();
         // Check if the NPC id is valid.
         var entity = player.getScene().getEntityById(npcEntityId);
         if (entity != null) {
@@ -36,15 +38,14 @@ public final class TalkManager extends BasePlayerManager {
                 .getFinishExec()
                 .forEach(e -> player.getServer().getTalkSystem().triggerExec(player, talkData, e));
 
-            // Save the talk value to the quest's data.
-            this.saveTalkToQuest(talkId, talkData.getQuestId());
-        }
-
         // Invoke the talking events for quests.
         var questManager = player.getQuestManager();
         questManager.queueEvent(QUEST_CONTENT_COMPLETE_ANY_TALK, talkId);
         questManager.queueEvent(QUEST_CONTENT_COMPLETE_TALK, talkId);
         questManager.queueEvent(QUEST_COND_COMPLETE_TALK, talkId);
+
+        // Save the talk value to the quest's data.
+        this.saveTalkToQuest(talkId, talkData.getQuestId());
     }
 
     public void saveTalkToQuest(int talkId, int mainQuestId) {

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -1,44 +1,54 @@
 package emu.grasscutter.game.world;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.*;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.GameDepot;
 import emu.grasscutter.data.binout.SceneNpcBornEntry;
 import emu.grasscutter.data.binout.routes.Route;
-import emu.grasscutter.data.excels.*;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.SceneData;
 import emu.grasscutter.data.excels.codex.CodexAnimalData;
 import emu.grasscutter.data.excels.monster.MonsterData;
 import emu.grasscutter.data.excels.world.WorldLevelData;
 import emu.grasscutter.data.server.Grid;
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.dungeons.*;
+import emu.grasscutter.game.dungeons.DungeonManager;
+import emu.grasscutter.game.dungeons.DungeonSettleListener;
 import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
 import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.entity.gadget.GadgetWorktop;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.managers.blossom.BlossomManager;
-import emu.grasscutter.game.player.*;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.TeamInfo;
 import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.QuestGroupSuite;
 import emu.grasscutter.game.world.data.TeleportProperties;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
-import emu.grasscutter.net.proto.*;
+import emu.grasscutter.net.proto.EnterTypeOuterClass;
+import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
-import emu.grasscutter.scripts.*;
+import emu.grasscutter.scripts.SceneIndexManager;
+import emu.grasscutter.scripts.SceneScriptManager;
 import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.*;
+import emu.grasscutter.scripts.data.SceneBlock;
+import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.event.entity.EntityCreationEvent;
 import emu.grasscutter.server.event.player.PlayerTeleportEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.objects.KahnsSort;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import lombok.*;
-
-import javax.annotation.Nullable;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.val;
 
 public final class Scene {
     @Getter private final World world;

src/main/java/emu/grasscutter/plugin/PluginManager.java

@@ -1,18 +1,17 @@
 package emu.grasscutter.plugin;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.event.*;
 import emu.grasscutter.utils.*;
-import lombok.*;
-
-import javax.annotation.Nullable;
 import java.io.*;
 import java.lang.reflect.Method;
 import java.net.*;
 import java.util.*;
 import java.util.jar.*;
-
+import javax.annotation.Nullable;
-import static emu.grasscutter.utils.lang.Language.translate;
+import lombok.*;
 
 /** Manages the server's plugins and the event system. */
 public final class PluginManager {
@@ -217,14 +216,9 @@ public final class PluginManager {
                     Grasscutter.getLogger().info(translate("plugin.enabling_plugin", name));
                     try {
                         plugin.onEnable();
-                        return;
-                    } catch (NoSuchMethodError ignored) {
-                        Grasscutter.getLogger().error(translate("plugin.invalid_api.outdated", name));
                     } catch (Throwable exception) {
                         Grasscutter.getLogger().error(translate("plugin.enabling_failed", name), exception);
                     }
-
-                    this.disablePlugin(plugin);
                 });
     }
 

src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.scripts;
 
+import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
+
 import com.github.davidmoten.rtreemulti.RTree;
 import com.github.davidmoten.rtreemulti.geometry.Geometry;
 import emu.grasscutter.Grasscutter;
@@ -19,20 +21,17 @@ import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
 import emu.grasscutter.utils.*;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.*;
-import kotlin.Pair;
-import lombok.val;
-import org.luaj.vm2.*;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
-
-import javax.annotation.*;
 import java.io.*;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-
+import javax.annotation.*;
-import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
+import kotlin.Pair;
+import lombok.val;
+import org.luaj.vm2.*;
+import org.luaj.vm2.lib.jse.CoerceJavaToLua;
 
 public class SceneScriptManager {
     private final Scene scene;
@@ -802,10 +801,10 @@ public class SceneScriptManager {
     private void realCallEvent(@Nonnull ScriptArgs params) {
         try {
             ScriptLoader.getScriptLib().setSceneScriptManager(this);
-
+            int eventType = params.type;
-            var eventType = params.type;
+            Set<SceneTrigger> relevantTriggers = new HashSet<>();
-            var relevantTriggers = switch (eventType) {
+            if (eventType == EventType.EVENT_ENTER_REGION || eventType == EventType.EVENT_LEAVE_REGION) {
-                case EventType.EVENT_ENTER_REGION, EventType.EVENT_LEAVE_REGION ->
+                relevantTriggers =
                         this.getTriggersByEvent(eventType).stream()
                                 .filter(
                                         t ->
@@ -813,15 +812,15 @@ public class SceneScriptManager {
                                                         && (t.getSource().isEmpty()
                                                                 || t.getSource().equals(params.getEventSource())))
                                 .collect(Collectors.toSet());
-                default ->
+            } else {
+                relevantTriggers =
                         this.getTriggersByEvent(eventType).stream()
                                 .filter(
                                         t -> params.getGroupId() == 0 || t.getCurrentGroup().id == params.getGroupId())
                                 .filter(
                                         t -> (t.getSource().isEmpty() || t.getSource().equals(params.getEventSource())))
                                 .collect(Collectors.toSet());
-            };
+            }
-
             for (SceneTrigger trigger : relevantTriggers) {
                 handleEventForTrigger(params, trigger);
             }

src/main/java/emu/grasscutter/server/game/GameServer.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.server.game;
 
+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.*;
 import emu.grasscutter.Grasscutter.ServerRunMode;
 import emu.grasscutter.database.DatabaseHelper;
@@ -29,18 +32,13 @@ import emu.grasscutter.server.event.internal.*;
 import emu.grasscutter.server.event.types.ServerEvent;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.task.TaskMap;
-import emu.grasscutter.utils.Utils;
-import kcp.highway.*;
-import lombok.*;
-import org.jetbrains.annotations.NotNull;
-
 import java.net.*;
 import java.time.*;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
-
+import kcp.highway.*;
-import static emu.grasscutter.config.Configuration.*;
+import lombok.*;
-import static emu.grasscutter.utils.lang.Language.translate;
+import org.jetbrains.annotations.NotNull;
 
 @Getter
 public final class GameServer extends KcpServer implements Iterable<Player> {
@@ -328,27 +326,16 @@ public final class GameServer extends KcpServer implements Iterable<Player> {
     }
 
     public void onServerShutdown() {
-        var event = new ServerStopEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
+        ServerStopEvent event = new ServerStopEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
         event.call();
 
         this.getPlayers()
                 .forEach(
-                (uid, player) -> player.getSession().close());
+                        (uid, player) -> {
+                            player.getSession().close();
+                        });
 
         this.getWorlds().forEach(World::save);
-
-        Utils.sleep(1000L); // Wait 1 second for operations to finish.
-
-        try {
-            var threadPool = GameSessionManager.getLogicThread();
-
-            // Shutdown network thread.
-            threadPool.shutdownGracefully();
-            // Wait for the network thread to finish.
-            if (!threadPool.awaitTermination(5, TimeUnit.SECONDS)) {
-                Grasscutter.getLogger().error("Logic thread did not terminate!");
-            }
-        } catch (InterruptedException ignored) { }
     }
 
     @NotNull @Override

src/main/java/emu/grasscutter/server/game/GameSession.java

@@ -1,21 +1,27 @@
 package emu.grasscutter.server.game;
 
+import static emu.grasscutter.config.Configuration.GAME_INFO;
+import static emu.grasscutter.config.Configuration.SERVER;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.PacketOpcodesUtils;
 import emu.grasscutter.server.event.game.SendPacketEvent;
-import emu.grasscutter.utils.*;
+import emu.grasscutter.utils.Crypto;
-import io.netty.buffer.*;
+import emu.grasscutter.utils.FileUtils;
-import lombok.*;
+import emu.grasscutter.utils.Utils;
-
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
-
+import lombok.Getter;
-import static emu.grasscutter.config.Configuration.*;
+import lombok.Setter;
-import static emu.grasscutter.utils.lang.Language.translate;
 
 public class GameSession implements GameSessionManager.KcpChannel {
     private final GameServer server;
@@ -133,11 +139,7 @@ public class GameSession implements GameSessionManager.KcpChannel {
         SendPacketEvent event = new SendPacketEvent(this, packet);
         event.call();
         if (!event.isCanceled()) { // If event is not cancelled, continue.
-            try {
             tunnel.writeData(event.getPacket().build());
-            } catch (Exception ignored) {
-                Grasscutter.getLogger().debug("Unable to send packet to client.");
-            }
         }
     }
 

src/main/java/emu/grasscutter/server/game/GameSessionManager.java

@@ -2,16 +2,16 @@ package emu.grasscutter.server.game;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.utils.Utils;
-import io.netty.buffer.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.DefaultEventLoop;
-import kcp.highway.*;
-import lombok.Getter;
-
 import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
+import kcp.highway.KcpListener;
+import kcp.highway.Ukcp;
 
 public class GameSessionManager {
-    @Getter private static final DefaultEventLoop logicThread = new DefaultEventLoop();
+    private static final DefaultEventLoop logicThread = new DefaultEventLoop();
     private static final ConcurrentHashMap<Ukcp, GameSession> sessions = new ConcurrentHashMap<>();
     private static final KcpListener listener =
             new KcpListener() {

src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestCreateEntityReq.java

@@ -1,13 +1,15 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.data.excels.monster.MonsterData;
 import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.world.Position;
-import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq;
-import emu.grasscutter.scripts.data.SceneGadget;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketQuestCreateEntityRsp;
 import lombok.val;
@@ -28,29 +30,12 @@ public class HandlerQuestCreateEntityReq extends PacketHandler {
             case GADGET_ID -> {
                 val gadgetId = entity.getGadgetId();
                 val gadgetInfo = entity.getGadget();
-                var gadgetData = GameData.getGadgetDataMap().get(gadgetId);
+                GadgetData gadgetData = GameData.getGadgetDataMap().get(gadgetId);
                 gameEntity =
                         switch (gadgetData.getType()) {
                             case Vehicle -> new EntityVehicle(scene, session.getPlayer(), gadgetId, 0, pos, rot);
-                            case Chest -> {
-                                var chest = gadgetInfo.getChest();
-                                var gadget = new EntityGadget(scene, gadgetId, pos, rot);
-                                // Create the gadget data for the chest.
-                                var metaGadget = new SceneGadget();
-                                metaGadget.drop_count = 1; // TODO: Check if more items should be dropped.
-                                metaGadget.chest_drop_id = chest.getChestDropId();
-                                metaGadget.setShowcutscene(chest.getIsShowCutscene());
-                                // Apply the gadget data to the chest.
-                                gadget.setMetaGadget(metaGadget);
-
-                                yield gadget;
-                            }
                             default -> new EntityGadget(scene, gadgetId, pos, rot);
                         };
-
-                if (gameEntity instanceof EntityGadget gadget) {
-                    gadget.buildContent();
-                }
             }
             case ITEM_ID -> {
                 val itemId = entity.getItemId();

src/main/java/emu/grasscutter/utils/Utils.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.utils;
 
+import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.config.ConfigContainer;
 import emu.grasscutter.data.DataLoader;
@@ -8,20 +11,15 @@ import emu.grasscutter.utils.objects.Returnable;
 import io.javalin.http.Context;
 import io.netty.buffer.*;
 import it.unimi.dsi.fastutil.ints.*;
-import org.slf4j.Logger;
-
-import javax.annotation.Nullable;
 import java.io.*;
-import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.time.*;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
-
+import javax.annotation.Nullable;
-import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import org.slf4j.Logger;
-import static emu.grasscutter.utils.lang.Language.translate;
 
 @SuppressWarnings({"UnusedReturnValue", "BooleanMethodIsAlwaysInverted"})
 public final class Utils {
@@ -486,7 +484,6 @@ public final class Utils {
      *
      * @param runnable The task to run.
      */
-    @SuppressWarnings("BusyWait")
     public static void waitFor(Returnable<Boolean> runnable) {
         while (!runnable.invoke()) {
             try {
@@ -496,33 +493,4 @@ public final class Utils {
             }
         }
     }
-
-    /**
-     * Recursively finds all fields in a class.
-     *
-     * @param type The class to find fields in.
-     * @return A list of all fields in the class.
-     */
-    public static List<Field> getAllFields(Class<?> type) {
-        var fields = new LinkedList<>(Arrays.asList(type.getDeclaredFields()));
-
-        // Check for superclasses.
-        if (type.getSuperclass() != null) {
-            fields.addAll(getAllFields(type.getSuperclass()));
-        }
-
-        return fields;
-    }
-
-    /**
-     * Sleeps the current thread without an exception.
-     *
-     * @param millis The amount of milliseconds to sleep.
-     */
-    public static void sleep(long millis) {
-        try {
-            Thread.sleep(millis);
-        } catch (InterruptedException ignored) {
-        }
-    }
 }

src/main/java/emu/grasscutter/utils/objects/FieldFetch.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.utils.objects;
 
-import com.google.gson.*;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
 import emu.grasscutter.server.dispatch.IDispatcher;
-import emu.grasscutter.utils.Utils;
-
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
 
 public interface FieldFetch {
     /**
@@ -18,7 +18,7 @@ public interface FieldFetch {
         // Prepare field properties.
         var fieldValues = new JsonObject();
         var fieldMap = new HashMap<String, Field>();
-        Utils.getAllFields(this.getClass())
+        Arrays.stream(this.getClass().getDeclaredFields())
                 .forEach(field -> fieldMap.put(field.getName(), field));
 
         // Find the values of all requested fields.

src/main/resources/languages/en-US.json

@@ -463,8 +463,7 @@
     "disabling_failed": "Failed to disable plugin: %s",
     "invalid_api": {
       "not_present": "Plugin %s does not specify an API version.",
-      "lower": "Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/es-ES.json

@@ -463,8 +463,7 @@
     "disabling_failed": "Error al desactivar el plugin: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/fr-FR.json

@@ -463,8 +463,7 @@
     "disabling_failed": "Impossible de désactiver le plugin %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/it-IT.json

@@ -463,8 +463,7 @@
     "disabling_failed": "Impossibile disabilitare il plug-in: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/ja-JP.json

@@ -463,8 +463,7 @@
     "disabling_failed": "プラグインの無効化に失敗しました: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/ko-KR.json

@@ -463,8 +463,7 @@
     "disabling_failed": "플러그인을 비활성화하는데 실패했습니다: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/pl-PL.json

@@ -463,8 +463,7 @@
     "disabling_failed": "Nie udało się wyłączyć pluginu: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/ro-RO.json

@@ -463,8 +463,7 @@
     "disabling_failed": "🇺🇸Failed to disable plugin: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/ru-RU.json

@@ -463,8 +463,7 @@
     "disabling_failed": "Ошибка отключения Плагина: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/zh-CN.json

@@ -463,8 +463,7 @@
     "disabling_failed": "无法禁用插件：%s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }

src/main/resources/languages/zh-TW.json

@@ -463,8 +463,7 @@
     "disabling_failed": "🇺🇸Failed to disable plugin: %s",
     "invalid_api": {
       "not_present": "🇺🇸Plugin %s does not specify an API version.",
-      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s.",
+      "lower": "🇺🇸Plugin %s is using API version %s, while the server is using API version %s."
-      "outdated": "🇺🇸Plugin %s is using an outdated API method."
     }
   }
 }