diff --git a/.gitignore b/.gitignore index 7e94e0d..950a9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bin/ .gradle/ -build/ \ No newline at end of file +build/ +mp-server/bukkit-command/ \ No newline at end of file diff --git a/mp-server/bukkit_command/banned-ips.txt b/mp-server/bukkit_command/banned-ips.txt index d8caf5a..a9f59b8 100644 --- a/mp-server/bukkit_command/banned-ips.txt +++ b/mp-server/bukkit_command/banned-ips.txt @@ -1,3 +1,3 @@ -# Updated 2/28/25, 1:34 PM by Minecraft 1.6.4 +# Updated 2/28/25, 2:31 PM by Minecraft 1.6.4 # victim name | ban date | banned by | banned until | reason diff --git a/mp-server/bukkit_command/banned-players.txt b/mp-server/bukkit_command/banned-players.txt index d8caf5a..a9f59b8 100644 --- a/mp-server/bukkit_command/banned-players.txt +++ b/mp-server/bukkit_command/banned-players.txt @@ -1,3 +1,3 @@ -# Updated 2/28/25, 1:34 PM by Minecraft 1.6.4 +# Updated 2/28/25, 2:31 PM by Minecraft 1.6.4 # victim name | ban date | banned by | banned until | reason diff --git a/mp-server/bukkit_command/server.log b/mp-server/bukkit_command/server.log index 7e7194d..2c3b3fa 100644 --- a/mp-server/bukkit_command/server.log +++ b/mp-server/bukkit_command/server.log @@ -2594,3 +2594,48 @@ java.io.IOException: Input/output error 2025-02-28 13:34:29 [INFO] Preparing start region for level 2 (Seed: 6315230501368462904) 2025-02-28 13:34:30 [INFO] Server permissions file permissions.yml is empty, ignoring it 2025-02-28 13:34:30 [INFO] Done (1.215s)! For help, type "help" or "?" +2025-02-28 14:31:38 [INFO] Starting minecraft server version 1.6.4 +2025-02-28 14:31:38 [INFO] Loading properties +2025-02-28 14:31:38 [INFO] Default game type: SURVIVAL +2025-02-28 14:31:38 [INFO] Generating keypair +2025-02-28 14:31:38 [INFO] Starting Minecraft server on 127.0.0.1:25569 +2025-02-28 14:31:38 [INFO] This server is running CraftBukkit version git-Bukkit-1.6.4-R2.0-b2918jnks (MC: 1.6.4) (Implementing API version 1.6.4-R2.0) +2025-02-28 14:31:38 [WARNING] **** SERVER IS RUNNING IN OFFLINE/INSECURE MODE! +2025-02-28 14:31:38 [WARNING] The server will make no attempt to authenticate usernames. Beware. +2025-02-28 14:31:38 [WARNING] While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose. +2025-02-28 14:31:38 [WARNING] To change this, set "online-mode" to "true" in the server.properties file. +2025-02-28 14:31:38 [INFO] Preparing level "world" +2025-02-28 14:31:38 [INFO] Preparing start region for level 0 (Seed: 6315230501368462904) +2025-02-28 14:31:38 [SEVERE] Exception in thread "Thread-5" +2025-02-28 14:31:38 [SEVERE] org.bukkit.craftbukkit.libs.com.google.gson.JsonSyntaxException: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 7 + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.libs.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter.read(ReflectiveTypeAdapterFactory.java:176) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.libs.com.google.gson.Gson.fromJson(Gson.java:795) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.libs.com.google.gson.Gson.fromJson(Gson.java:734) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.v1_6_R3.updater.BukkitDLUpdaterService.fetchArtifact(BukkitDLUpdaterService.java:51) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.v1_6_R3.updater.BukkitDLUpdaterService.getArtifact(BukkitDLUpdaterService.java:28) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.v1_6_R3.updater.AutoUpdater$1.run(AutoUpdater.java:77) + +2025-02-28 14:31:38 [SEVERE] Caused by: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 7 + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.libs.com.google.gson.stream.JsonReader.expect(JsonReader.java:339) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.libs.com.google.gson.stream.JsonReader.beginObject(JsonReader.java:322) + +2025-02-28 14:31:38 [SEVERE] at org.bukkit.craftbukkit.libs.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter.read(ReflectiveTypeAdapterFactory.java:165) + +2025-02-28 14:31:38 [SEVERE] ... 5 more + +2025-02-28 14:31:39 [INFO] Preparing start region for level 1 (Seed: 6315230501368462904) +2025-02-28 14:31:39 [INFO] Preparing start region for level 2 (Seed: 6315230501368462904) +2025-02-28 14:31:39 [INFO] Server permissions file permissions.yml is empty, ignoring it +2025-02-28 14:31:39 [INFO] Done (1.186s)! For help, type "help" or "?" +2025-02-28 14:32:19 [INFO] Catfoolyou[/127.0.0.1:55703] logged in with entity id 209 at ([world] 78.40428970787869, 70.0, 261.48653669688895) +2025-02-28 14:36:48 [INFO] Connection reset +2025-02-28 14:36:48 [INFO] Catfoolyou lost connection: disconnect.quitting +2025-02-28 14:36:48 [INFO] §eCatfoolyou left the game. diff --git a/mp-server/bukkit_command/server.log.lck b/mp-server/bukkit_command/server.log.lck deleted file mode 100644 index e69de29..0000000 diff --git a/mp-server/bukkit_command/server.properties b/mp-server/bukkit_command/server.properties index 5319aee..e0deaa9 100644 --- a/mp-server/bukkit_command/server.properties +++ b/mp-server/bukkit_command/server.properties @@ -1,12 +1,12 @@ #Minecraft server properties -#Fri Feb 28 13:34:28 EST 2025 +#Fri Feb 28 14:31:38 EST 2025 view-distance=10 max-build-height=256 server-ip=127.0.0.1 level-seed= -gamemode=0 -allow-nether=true server-port=25569 +allow-nether=true +gamemode=0 enable-rcon=false enable-query=false generator-settings= diff --git a/mp-server/bukkit_command/world/data/Mineshaft.dat b/mp-server/bukkit_command/world/data/Mineshaft.dat index 7aed8d1..4936fbc 100644 Binary files a/mp-server/bukkit_command/world/data/Mineshaft.dat and b/mp-server/bukkit_command/world/data/Mineshaft.dat differ diff --git a/mp-server/bukkit_command/world/data/villages.dat b/mp-server/bukkit_command/world/data/villages.dat index e137833..38ba27f 100644 Binary files a/mp-server/bukkit_command/world/data/villages.dat and b/mp-server/bukkit_command/world/data/villages.dat differ diff --git a/mp-server/bukkit_command/world/level.dat b/mp-server/bukkit_command/world/level.dat index 1ee2608..bd1a13a 100644 Binary files a/mp-server/bukkit_command/world/level.dat and b/mp-server/bukkit_command/world/level.dat differ diff --git a/mp-server/bukkit_command/world/level.dat_old b/mp-server/bukkit_command/world/level.dat_old index cbe1b03..1ee2608 100644 Binary files a/mp-server/bukkit_command/world/level.dat_old and b/mp-server/bukkit_command/world/level.dat_old differ diff --git a/mp-server/bukkit_command/world/players/Catfoolyou.dat b/mp-server/bukkit_command/world/players/Catfoolyou.dat index 6ddbec7..171f1d2 100644 Binary files a/mp-server/bukkit_command/world/players/Catfoolyou.dat and b/mp-server/bukkit_command/world/players/Catfoolyou.dat differ diff --git a/mp-server/bukkit_command/world/region/r.-1.0.mca b/mp-server/bukkit_command/world/region/r.-1.0.mca index 997a614..8ae1e0b 100644 Binary files a/mp-server/bukkit_command/world/region/r.-1.0.mca and b/mp-server/bukkit_command/world/region/r.-1.0.mca differ diff --git a/mp-server/bukkit_command/world/region/r.0.0.mca b/mp-server/bukkit_command/world/region/r.0.0.mca index 157ac8c..6bbd8e1 100644 Binary files a/mp-server/bukkit_command/world/region/r.0.0.mca and b/mp-server/bukkit_command/world/region/r.0.0.mca differ diff --git a/mp-server/bukkit_command/world/session.lock b/mp-server/bukkit_command/world/session.lock index 6a792ad..d18fe58 100644 Binary files a/mp-server/bukkit_command/world/session.lock and b/mp-server/bukkit_command/world/session.lock differ diff --git a/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.-1.mca b/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.-1.mca index f0c8574..1c00f67 100644 Binary files a/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.-1.mca and b/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.-1.mca differ diff --git a/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.0.mca b/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.0.mca index d820a52..3c65909 100644 Binary files a/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.0.mca and b/mp-server/bukkit_command/world_nether/DIM-1/region/r.-1.0.mca differ diff --git a/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.-1.mca b/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.-1.mca index 756d0fd..015b2cf 100644 Binary files a/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.-1.mca and b/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.-1.mca differ diff --git a/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.0.mca b/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.0.mca index 5f0ebad..7427a53 100644 Binary files a/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.0.mca and b/mp-server/bukkit_command/world_nether/DIM-1/region/r.0.0.mca differ diff --git a/mp-server/bukkit_command/world_nether/level.dat b/mp-server/bukkit_command/world_nether/level.dat index 2aee30e..ba4ff79 100644 Binary files a/mp-server/bukkit_command/world_nether/level.dat and b/mp-server/bukkit_command/world_nether/level.dat differ diff --git a/mp-server/bukkit_command/world_nether/level.dat_old b/mp-server/bukkit_command/world_nether/level.dat_old index 7adc194..2aee30e 100644 Binary files a/mp-server/bukkit_command/world_nether/level.dat_old and b/mp-server/bukkit_command/world_nether/level.dat_old differ diff --git a/mp-server/bukkit_command/world_nether/session.lock b/mp-server/bukkit_command/world_nether/session.lock index ae201a3..4176823 100644 Binary files a/mp-server/bukkit_command/world_nether/session.lock and b/mp-server/bukkit_command/world_nether/session.lock differ diff --git a/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.-1.mca b/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.-1.mca index 31f37ba..2d8128b 100644 Binary files a/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.-1.mca and b/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.-1.mca differ diff --git a/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.0.mca b/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.0.mca index 4930949..f911375 100644 Binary files a/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.0.mca and b/mp-server/bukkit_command/world_the_end/DIM1/region/r.-1.0.mca differ diff --git a/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.-1.mca b/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.-1.mca index 9fad4ac..622d324 100644 Binary files a/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.-1.mca and b/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.-1.mca differ diff --git a/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.0.mca b/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.0.mca index a87f599..ac5eeed 100644 Binary files a/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.0.mca and b/mp-server/bukkit_command/world_the_end/DIM1/region/r.0.0.mca differ diff --git a/mp-server/bukkit_command/world_the_end/level.dat b/mp-server/bukkit_command/world_the_end/level.dat index 28a5e48..16fbbc0 100644 Binary files a/mp-server/bukkit_command/world_the_end/level.dat and b/mp-server/bukkit_command/world_the_end/level.dat differ diff --git a/mp-server/bukkit_command/world_the_end/level.dat_old b/mp-server/bukkit_command/world_the_end/level.dat_old index 8afac43..28a5e48 100644 Binary files a/mp-server/bukkit_command/world_the_end/level.dat_old and b/mp-server/bukkit_command/world_the_end/level.dat_old differ diff --git a/mp-server/bukkit_command/world_the_end/session.lock b/mp-server/bukkit_command/world_the_end/session.lock index 2ee5384..ca69d8f 100644 Binary files a/mp-server/bukkit_command/world_the_end/session.lock and b/mp-server/bukkit_command/world_the_end/session.lock differ diff --git a/mp-server/bungee_command/proxy.log.0 b/mp-server/bungee_command/proxy.log.0 index d2c3675..1cfebcd 100644 --- a/mp-server/bungee_command/proxy.log.0 +++ b/mp-server/bungee_command/proxy.log.0 @@ -83630,3 +83630,37 @@ java.lang.NullPointerException: Cannot invoke "io.netty.channel.MessageList.recy 13:34:44 [INFO] Server bans.txt changed, it will be reloaded automatically 13:34:44 [INFO] Reload complete 13:34:44 [INFO] Reloaded 'origin_blacklist.txt'. +14:31:27 [INFO] Enabled BungeeCord version unknown +14:31:27 [INFO] Enabled plugin EaglerSkins version 1.0.0 by LAX1DUDE +14:31:27 [INFO] Enabled plugin EaglerVoice version 1.0.0 by ayunami2000 +14:31:27 [INFO] Listening websockets on /0.0.0.0:25565 +14:31:27 [INFO] Listening on /127.11.0.1:46689 +14:31:27 [INFO] Server bans.txt changed, it will be reloaded automatically +14:31:27 [INFO] Reload complete +14:31:28 [INFO] Reloaded 'origin_blacklist.txt'. +14:32:19 [INFO] [WebsocketProxy] - connecting (?) + +14:32:19 [INFO] Actually connecting + +14:32:19 [INFO] ChannelWrapper created + +14:32:19 [INFO] [InitialHandler] - connected (I think) + +14:32:19 [INFO] Handshake + +14:32:19 [INFO] [Catfoolyou] <-> InitialHandler has connected +14:32:19 [INFO] Skipping encryption... + +14:32:19 [INFO] Player 'Catfoolyou' [/127.0.0.1] has remote websocket IP: 127.0.0.1 +14:32:19 [INFO] Player 'Catfoolyou' [/127.0.0.1] is using a client at: +14:32:19 [INFO] [InitialHandler] - PacketCDClientStatus + +14:32:19 [INFO] ChannelWrapper created + +14:32:19 [INFO] [ServerConnector] - connected + +14:32:19 [INFO] [Catfoolyou] <-> ServerConnector [lobby] has connected +14:32:19 [INFO] [ServerConnector] - Handling LOGIN + +14:36:48 [INFO] [Catfoolyou] -> UpstreamBridge has disconnected +14:36:48 [INFO] [Catfoolyou] <-> DownstreamBridge <-> [lobby] has disconnected diff --git a/src/main/java/net/minecraft/src/RenderGlobal.java b/src/main/java/net/minecraft/src/RenderGlobal.java index d3db806..7322acb 100644 --- a/src/main/java/net/minecraft/src/RenderGlobal.java +++ b/src/main/java/net/minecraft/src/RenderGlobal.java @@ -433,7 +433,7 @@ public class RenderGlobal implements IWorldAccess } } - RenderHelper.enableStandardItemLighting(); + RenderHelper.enableStandardItemLighting2(); for (var6 = 0; var6 < this.tileEntities.size(); ++var6) {