Merge pull request #60 from zly2006/c2me-compat

fix: the shit server init logic for `fakePlayerResident`
Gu-ZT · Jul 10, 2024 · 9e0fbea · 9e0fbea
2 parents 650c127 + ff43629
commit 9e0fbea
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 67 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.21
 loader_version=0.15.11
 # parchment_version=2022.08.14
 # Mod Properties
-mod_version=2.8.0
+mod_version=2.9.0-zly2008-prs.1
 build_number=undefined
 maven_group=dev.dubhe.gugle
 archives_base_name=gugle-carpet-addition

diff --git a/src/main/java/dev/dubhe/gugle/carpet/GcaExtension.java b/src/main/java/dev/dubhe/gugle/carpet/GcaExtension.java
@@ -47,10 +47,6 @@ public class GcaExtension implements CarpetExtension, ModInitializer {
 
     public static final List<Map.Entry<Long, Consumer>> planFunction = new ArrayList<>();
 
-    static {
-        CarpetServer.manageExtension(new GcaExtension());
-    }
-
     @Override
     public void onPlayerLoggedIn(ServerPlayer player) {
         GcaExtension.fakePlayerInventoryContainerMap.put(player, Map.entry(
@@ -68,7 +64,8 @@ public void onGameStarted() {
         CarpetServer.settingsManager.parseSettingsClass(GcaSetting.class);
     }
 
-    public static void onServerStop(MinecraftServer server) {
+    @Override
+    public void onServerClosed(MinecraftServer server) {
         if (GcaSetting.fakePlayerResident) {
             JsonObject fakePlayerList = new JsonObject();
             fakePlayerInventoryContainerMap.forEach((player, fakePlayerInventoryContainer) -> {
@@ -87,21 +84,21 @@ public static void onServerStop(MinecraftServer server) {
         fakePlayerInventoryContainerMap.clear();
     }
 
-    public static void onServerStart(MinecraftServer server) {
+    @Override
+    public void onServerLoadedWorlds(MinecraftServer server) {
         if (GcaSetting.fakePlayerResident) {
-            JsonObject fakePlayerList = new JsonObject();
             File file = server.getWorldPath(LevelResource.ROOT).resolve("fake_player.gca.json").toFile();
             if (!file.isFile()) {
                 return;
             }
             try (BufferedReader bfr = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
-                fakePlayerList = GSON.fromJson(bfr, JsonObject.class);
+                JsonObject fakePlayerList = GSON.fromJson(bfr, JsonObject.class);
+                for (Map.Entry<String, JsonElement> entry : fakePlayerList.entrySet()) {
+                    FakePlayerResident.load(entry, server);
+                }
             } catch (IOException e) {
                 GcaExtension.LOGGER.error(e.getMessage(), e);
             }
-            for (Map.Entry<String, JsonElement> entry : fakePlayerList.entrySet()) {
-                FakePlayerResident.load(entry, server);
-            }
             file.delete();
         }
     }
@@ -113,5 +110,6 @@ public Map<String, String> canHasTranslations(String lang) {
 
     @Override
     public void onInitialize() {
+        CarpetServer.manageExtension(this);
     }
 }
diff --git a/src/main/java/dev/dubhe/gugle/carpet/mixin/MinecraftServerMixin.java b/src/main/java/dev/dubhe/gugle/carpet/mixin/MinecraftServerMixin.java
diff --git a/src/main/java/dev/dubhe/gugle/carpet/mixin/ServerPlayerMixin.java b/src/main/java/dev/dubhe/gugle/carpet/mixin/ServerPlayerMixin.java
diff --git a/src/main/java/dev/dubhe/gugle/carpet/tools/FakePlayerResident.java b/src/main/java/dev/dubhe/gugle/carpet/tools/FakePlayerResident.java
@@ -83,7 +83,7 @@ public static void createFake(String username, MinecraftServer server, Vec3 pos,
             gameprofile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(username), username);
         }
         GameProfile finalGameprofile = gameprofile;
-        EntityPlayerMPFakeInvoker.invokerFetchGameProfile(gameprofile.getName()).thenAccept((p) -> {
+        EntityPlayerMPFakeInvoker.invokerFetchGameProfile(gameprofile.getName()).thenAcceptAsync((p) -> {
             GameProfile current = finalGameprofile;
             if (p.isPresent()) {
                 current = p.get();
@@ -102,7 +102,7 @@ public static void createFake(String username, MinecraftServer server, Vec3 pos,
             playerMPFake.getAbilities().flying = flying;
             actionPackFromJson(actions, playerMPFake);
             ((EntityInvoker) playerMPFake).invokerUnsetRemoved();
-        });
+        }, server);
     }
 
     public static void load(Map.Entry<String, JsonElement> entry, MinecraftServer server) {

diff --git a/src/main/resources/gca.mixins.json b/src/main/resources/gca.mixins.json
@@ -13,7 +13,6 @@
     "FenceGateBlockMixin",
     "FishingHookMixin",
     "ItemStackMixin",
-    "MinecraftServerMixin",
     "PlayerAccessor",
     "PlayerMixin",
     "ServerLevelMixin",
@@ -23,8 +22,7 @@
   "server": [
   ],
   "client": [
-    "EntityMixin",
-    "ServerPlayerMixin"
+    "EntityMixin"
   ],
   "injectors": {
     "defaultRequire": 1