diff --git a/build/classes/java/main/com/reider745/InnerCoreServer.class b/build/classes/java/main/com/reider745/InnerCoreServer.class index 119fd583..5a281fa0 100644 Binary files a/build/classes/java/main/com/reider745/InnerCoreServer.class and b/build/classes/java/main/com/reider745/InnerCoreServer.class differ diff --git a/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/Network.class b/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/Network.class index e2081e60..d2ec65d1 100644 Binary files a/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/Network.class and b/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/Network.class differ diff --git a/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient$ClientState.class b/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient$ClientState.class index ed7742c3..80225894 100644 Binary files a/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient$ClientState.class and b/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient$ClientState.class differ diff --git a/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.class b/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.class index 5eaa13d4..5ba8df13 100644 Binary files a/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.class and b/build/classes/java/main/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.class differ diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index 06b637c7..42387987 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -62,9 +62,10 @@ public class InnerCoreServer { NetworkEntity.loadClass(); IdConversionMap.loadClass(); - //JSONObject object = new JSONObject(); - //object.put("fix", false); - //Network.getSingleton().addClientInitializationPacket("server_fixed.inventory", () -> object, (v ,v1) -> {}); + JSONObject object = new JSONObject(); + object.put("fix", server.getPropertyBoolean("inner_core.legacy_inventory", true)); + + Network.getSingleton().addServerInitializationPacket("server_fixed.inventory", (client) -> object, (v ,v1) -> {}); RuntimeIdDataPacketSender.loadClass(); Network.getSingleton().startLanServer(); diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java index 2805aecf..0fef3ea7 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java +++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java @@ -17,6 +17,7 @@ import com.zhekasmirnov.apparatus.multiplayer.server.ModdedServer; import com.zhekasmirnov.horizon.runtime.logger.Logger; import com.zhekasmirnov.innercore.api.log.ICLog; import com.zhekasmirnov.innercore.api.runtime.MainThreadQueue; +import org.json.JSONObject; import java.io.IOException; import java.net.Socket; @@ -57,6 +58,10 @@ public class Network { }); server.addOnClientConnectionRequestedListener((ConnectedClient client) -> { + JSONObject object = new JSONObject(); + object.put("fix", true); + client.send("server_fixed.inventory", object); + //Network.getSingleton().addClientInitializationPacket("server_fixed.inventory", () -> object, (v ,v1) -> {}); if (EngineConfig.isDeveloperMode()) { Logger.debug("server: client connection requested"); } diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java index 3431bc7d..d6e33353 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java +++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java @@ -1,12 +1,14 @@ package com.zhekasmirnov.apparatus.multiplayer.server; import cn.nukkit.network.protocol.SetLocalPlayerAsInitializedPacket; +import com.zhekasmirnov.apparatus.multiplayer.Network; import com.zhekasmirnov.apparatus.multiplayer.ThreadTypeMarker; import com.zhekasmirnov.apparatus.multiplayer.channel.ChannelInterface; import com.zhekasmirnov.apparatus.multiplayer.channel.data.DataChannel; import com.zhekasmirnov.apparatus.util.Java8BackComp; import com.zhekasmirnov.horizon.runtime.logger.Logger; import com.zhekasmirnov.innercore.api.InnerCoreConfig; +import org.json.JSONObject; import java.io.IOException; import java.util.*; @@ -53,13 +55,6 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket this.channel.addListener(this); - /* - Пометка для себя, сделать отключение, если не входишь с иннера - */ - - //SetLocalPlayerAsInitializedPacket.clients.put(client, this); - - this.addInitializationPacketListener("system.player_entity", (ConnectedClient cl, Object data, Class dataType) -> { try { playerUid = Long.parseLong(data.toString()); diff --git a/target/server.jar b/target/Nukkit-MOT-SNAPSHOT.jar similarity index 100% rename from target/server.jar rename to target/Nukkit-MOT-SNAPSHOT.jar diff --git a/target/ZotCoreLoader_2.jar b/target/ZotCoreLoader_2.jar index 68c96b1f..e8068390 100644 Binary files a/target/ZotCoreLoader_2.jar and b/target/ZotCoreLoader_2.jar differ diff --git a/target/logs/2023-11-14-1.log.gz b/target/logs/2023-11-14-1.log.gz new file mode 100644 index 00000000..fa5de4d8 Binary files /dev/null and b/target/logs/2023-11-14-1.log.gz differ diff --git a/target/logs/2023-11-14-2.log.gz b/target/logs/2023-11-14-2.log.gz new file mode 100644 index 00000000..1db2931b Binary files /dev/null and b/target/logs/2023-11-14-2.log.gz differ diff --git a/target/logs/2023-11-14-3.log.gz b/target/logs/2023-11-14-3.log.gz new file mode 100644 index 00000000..78ed4e7e Binary files /dev/null and b/target/logs/2023-11-14-3.log.gz differ diff --git a/target/logs/2023-11-14-4.log.gz b/target/logs/2023-11-14-4.log.gz new file mode 100644 index 00000000..74206d9d Binary files /dev/null and b/target/logs/2023-11-14-4.log.gz differ diff --git a/target/logs/2023-11-14-5.log.gz b/target/logs/2023-11-14-5.log.gz new file mode 100644 index 00000000..6ea0a553 Binary files /dev/null and b/target/logs/2023-11-14-5.log.gz differ diff --git a/target/logs/2023-11-14-6.log.gz b/target/logs/2023-11-14-6.log.gz new file mode 100644 index 00000000..90873db9 Binary files /dev/null and b/target/logs/2023-11-14-6.log.gz differ diff --git a/target/logs/2023-11-14-7.log.gz b/target/logs/2023-11-14-7.log.gz new file mode 100644 index 00000000..dd77a087 Binary files /dev/null and b/target/logs/2023-11-14-7.log.gz differ diff --git a/target/logs/server.log b/target/logs/server.log index aba07850..a67bea6f 100644 --- a/target/logs/server.log +++ b/target/logs/server.log @@ -1,30 +1,31 @@ -2023-11-13 11:59:53.469 [main] INFO - Loading server properties... -2023-11-13 11:59:54.103 [main] INFO - b-- cNukkit dMOT b-- -2023-11-13 11:59:55.963 [main] INFO - Loading runtime blocks... -2023-11-13 12:00:01.606 [main] INFO - Loaded 0 resource packs -2023-11-13 12:00:01.613 [main] INFO - Opening server on 0.0.0.0:19132 -2023-11-13 12:00:02.823 [main] WARN - Unknown channel option 'IP_DONTFRAG' for channel '[id: 0xebc0522f]' -2023-11-13 12:00:02.839 [main] INFO - Enabling Nukkit-MOT vgit-8cac79a -2023-11-13 12:00:02.876 [main] INFO - Preparing level "aworldf" -2023-11-13 12:00:03.342 [main] INFO - Preparing level "anetherf" -2023-11-13 12:00:03.428 [main] INFO - start load inner core C:\vs\ZotCoreLoader_2\target/ -2023-11-13 12:00:03.442 [main] INFO - [INNERCORE-FILE]work directory check successful -2023-11-13 12:00:03.552 [main] INFO - modded server started (socket port 2304) -2023-11-13 12:00:03.592 [main] INFO - [INNERCORE]end load, time: 159 -2023-11-13 12:00:03.599 [main] INFO - [INNERCORE]====Inner Core Test====version: 2.3.1b115 test 152 -2023-11-13 12:00:03.604 [main] INFO - Done (10.245s)! For help, type "help" -2023-11-13 12:00:07.909 [main] INFO - e######################################### -2023-11-13 12:00:07.911 [main] INFO - cNukkit3-dMOT -2023-11-13 12:00:07.912 [main] INFO - 6Build: bmaster/8cac79a -2023-11-13 12:00:07.914 [main] INFO - 6Multiversion: bUp to version 1.20.40 -2023-11-13 12:00:07.915 [main] INFO - e######################################### -2023-11-13 12:00:08.118 [ForkJoinPool.commonPool-worker-1] INFO - c[Nukkit-MOT] aYou are running the latest version. -2023-11-13 12:00:15.283 [Network Listener - #0] INFO - client connected via native protocol -2023-11-13 12:00:15.289 [Network Listener - #0] INFO - server: client connection requested -2023-11-13 12:00:15.310 [main] WARN - Ignoring InnerCorePacket from 192.168.1.42 due to player not verified yet -2023-11-13 12:00:15.510 [main] WARN - Ignoring InnerCorePacket from 192.168.1.42 due to player not verified yet -2023-11-13 12:00:15.511 [main] WARN - Ignoring InnerCorePacket from 192.168.1.42 due to player not verified yet -2023-11-13 12:00:16.962 [main] INFO - bbossf[/192.168.1.42:38409] [Protocol Version: 422 (1.16.200)] logged in -2023-11-13 12:00:16.985 [main] WARN - It is not possible to get the player's port -2023-11-13 12:00:19.217 [Thread-9] INFO - server: client connected player=1 -2023-11-13 12:00:37.061 [main] INFO - eboss joined the game +2023-11-14 12:50:20.929 [main] INFO - Loading server properties... +2023-11-14 12:50:21.440 [main] INFO - b-- cNukkit dMOT b-- +2023-11-14 12:50:24.120 [main] INFO - Loading runtime blocks... +2023-11-14 12:50:38.439 [main] INFO - Loaded 0 resource packs +2023-11-14 12:50:38.553 [main] INFO - Opening server on 0.0.0.0:19132 +2023-11-14 12:50:43.292 [main] WARN - Unknown channel option 'IP_DONTFRAG' for channel '[id: 0xfcb34516]' +2023-11-14 12:50:43.373 [main] INFO - Enabling Nukkit-MOT vgit-7f0a965 +2023-11-14 12:50:43.556 [main] INFO - Preparing level "aworldf" +2023-11-14 12:50:46.276 [main] INFO - Preparing level "anetherf" +2023-11-14 12:50:46.447 [main] INFO - start load inner core C:\vs\ZotCoreLoader_2\target/ +2023-11-14 12:50:46.878 [main] INFO - [INNERCORE-FILE]work directory check successful +2023-11-14 12:50:47.668 [main] INFO - modded server started (socket port 2304) +2023-11-14 12:50:47.710 [main] INFO - [INNERCORE]end load, time: 1269 +2023-11-14 12:50:47.718 [main] INFO - [INNERCORE]====Inner Core Test====version: 2.3.1b115 test 152 +2023-11-14 12:50:47.725 [main] INFO - Done (26.86s)! For help, type "help" +2023-11-14 12:50:48.136 [ForkJoinPool.commonPool-worker-1] INFO - c[Nukkit-MOT][Update] eThere is a new build of cNukkit3-dMOT eavailable! Current: git-7f0a965 Latest: git-8cac79a +2023-11-14 12:50:48.140 [ForkJoinPool.commonPool-worker-1] INFO - c[Nukkit-MOT][Update] eYou can download the latest build from https://github.com/MemoriesOfTime/Nukkit-MOT/ +2023-11-14 12:51:32.210 [Network Listener - #0] INFO - client connected via native protocol +2023-11-14 12:51:32.217 [Network Listener - #0] INFO - server: client connection requested +2023-11-14 12:51:32.229 [main] WARN - Ignoring InnerCorePacket from 192.168.1.42 due to player not verified yet +2023-11-14 12:51:32.430 [main] WARN - Ignoring InnerCorePacket from 192.168.1.42 due to player not verified yet +2023-11-14 12:51:32.432 [main] WARN - Ignoring InnerCorePacket from 192.168.1.42 due to player not verified yet +2023-11-14 12:51:33.682 [main] INFO - bboss maincraftf[/192.168.1.42:55116] [Protocol Version: 422 (1.16.200)] logged in +2023-11-14 12:51:33.704 [main] WARN - It is not possible to get the player's port +2023-11-14 12:51:35.293 [Thread-9] INFO - server: client connected player=1 +2023-11-14 12:51:53.180 [main] INFO - eboss maincraft joined the game +2023-11-14 12:57:16.435 [main] WARN - It is not possible to get the player's port +2023-11-14 12:57:16.531 [main] INFO - eboss maincraft left the game +2023-11-14 12:57:16.549 [main] INFO - bboss maincraftf[/192.168.1.42:55116] logged out due to Disconnected from Server +2023-11-14 12:57:16.560 [Thread-9] INFO - client disconnected, reason: IOException occurred: native channel "client:/192.168.1.42" closed (manually) +2023-11-14 12:57:17.154 [Thread-9] INFO - server: client disconnected player=1 reason=IOException occurred: native channel "client:/192.168.1.42" closed (manually) diff --git a/target/players/CURRENT b/target/players/CURRENT index 6d0c8e66..caa721af 100644 --- a/target/players/CURRENT +++ b/target/players/CURRENT @@ -1 +1 @@ -MANIFEST-000201 +MANIFEST-000030 diff --git a/target/start.bat b/target/start.bat index 275f5f64..f33033a8 100644 --- a/target/start.bat +++ b/target/start.bat @@ -1,2 +1,2 @@ -"C:\Program Files\Java\jdk-17\bin\java.exe" -cp ZotCoreLoader_2.jar com.reider745.Main -pause \ No newline at end of file +"C:\Program Files\Java\jdk-17\bin\java.exe" -cp ZotCoreLoader_2.jar com.reider745.Main PATH_ASSETS=assets +pause \ No newline at end of file diff --git a/target/worlds/nether/level.dat b/target/worlds/nether/level.dat index 55ea7d38..61b5a891 100644 Binary files a/target/worlds/nether/level.dat and b/target/worlds/nether/level.dat differ diff --git a/target/worlds/nether/level.dat.bak b/target/worlds/nether/level.dat.bak index 8b38c010..2ef321fe 100644 Binary files a/target/worlds/nether/level.dat.bak and b/target/worlds/nether/level.dat.bak differ diff --git a/target/worlds/world/level.dat b/target/worlds/world/level.dat index 844a9f85..c018d356 100644 Binary files a/target/worlds/world/level.dat and b/target/worlds/world/level.dat differ diff --git a/target/worlds/world/level.dat.bak b/target/worlds/world/level.dat.bak index a153b5b8..ebde96b8 100644 Binary files a/target/worlds/world/level.dat.bak and b/target/worlds/world/level.dat.bak differ diff --git a/target/worlds/world/region/r.0.-1.mca b/target/worlds/world/region/r.0.-1.mca index c70cf962..a0bbf76c 100644 Binary files a/target/worlds/world/region/r.0.-1.mca and b/target/worlds/world/region/r.0.-1.mca differ diff --git a/target/worlds/world/region/r.0.0.mca b/target/worlds/world/region/r.0.0.mca index ff6f2c6d..5348ddbf 100644 Binary files a/target/worlds/world/region/r.0.0.mca and b/target/worlds/world/region/r.0.0.mca differ