Minor fixes

LilyBukkit · Aug 26, 2022 · b3acd31 · b3acd31
1 parent 1155581
commit b3acd31
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/server/inject/ru/vladthemountain/lilybukkit/LilyBukkit.java b/server/inject/ru/vladthemountain/lilybukkit/LilyBukkit.java
@@ -6,7 +6,6 @@
 import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.PropertyManager;
 import net.minecraft.src.ServerConfigurationManager;
 import net.minecraft.src.WorldServer;
@@ -47,7 +46,6 @@
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.error.MarkedYAMLException;
 import ru.vladthemountain.lilybukkit.command.ColouredConsoleSender;
-import ru.vladthemountain.lilybukkit.entity.LBPlayer;
 import ru.vladthemountain.lilybukkit.util.UpdateChecker;
 
 import java.io.File;
@@ -134,7 +132,7 @@ public String getName() {
      */
     @Override
     public String getVersion() {
-        return "Alpha 1.2.0.0";
+        return "Alpha 1.2.0.1";
     }
 
     /**
@@ -246,7 +244,9 @@ public String getUpdateFolder() {
 
     @Override
     public File getUpdateFolderFile() {
-        return new File(this.getUpdateFolder());
+        File folder = MinecraftServer.INSTANCE.getFile(this.getUpdateFolder());
+        if (!folder.exists()) folder.mkdir();
+        return folder;
     }
 
     /**
@@ -886,7 +886,7 @@ protected void CRAFTBUKKIT_loadConfig() {
         configuration.getString("settings.permissions-file", "permissions.yml");
 
         if (configuration.getNode("aliases") == null) {
-            List<String> icanhasbukkit = new ArrayList<String>();
+            List<String> icanhasbukkit = new ArrayList<>();
             icanhasbukkit.add("version");
             configuration.setProperty("aliases.icanhasbukkit", icanhasbukkit);
         }

diff --git a/server/patches/net/minecraft/server/MinecraftServer.java.diff b/server/patches/net/minecraft/server/MinecraftServer.java.diff
@@ -101,11 +101,11 @@
 +    public static MinecraftServer INSTANCE;
 +
 +    public int[] getVersion() {
-+        return new int[]{1, 1, 0, 5};
++        return new int[]{1, 1, 0, 6};
 +    }
 +
 +    public String getVersionTag() {
-+        return "beta";
++        return "dev";
 +    }
 +
 +    public String getVersionString() {
@@ -176,7 +176,7 @@
 +        // LilyBukkit start
 +        File modsDir = this.getFile("mods");
 +        if (!modsDir.exists()) {
-+            if (!modsDir.createNewFile()) logger.severe("Couldn't create 'mods' directory");
++            if (!modsDir.mkdirs()) logger.severe("Couldn't create 'mods' directory");
 +        } else this.modLoader.load(Environment.SERVER, new File("mods"));
 +        // LIlyBukkit end
          MinecraftServer.logger.info("Loading properties");

diff --git a/server/patches/net/minecraft/src/NetLoginHandler.java.diff b/server/patches/net/minecraft/src/NetLoginHandler.java.diff
@@ -79,7 +79,7 @@
 +
      @Override
      public void handleHandshake(final Packet2Handshake packet) {
-@@ -67,47 +68,70 @@
+@@ -67,47 +68,73 @@
              this.serverId = Long.toHexString(NetLoginHandler.rand.nextLong());
              this.netManager.addToSendQueue(new Packet2Handshake(this.serverId));
 -        }
@@ -107,9 +107,12 @@
 +        } else {
 +            NetLoginHandler.logger.info("User doesn't have ULPP enabled"); //LilyBukkit - additional output
          }
-+        if (ULPPManager.supportsExtension(packet.password, "ROSE", 1, 2)) {
-+            NetLoginHandler.logger.info("User connected via Rosepad"); //LilyBukkit - additional output
++        if (ULPPManager.supportsExtension(packet.password, "ROSE", 1, 1)) {
++            NetLoginHandler.logger.info("User connected via 1.1.0.2-1.1.0.5"); //LilyBukkit - additional output
 +            this.ROSEVersion = 1;
++        } else if (ULPPManager.supportsExtension(packet.password, "ROSE", 2, 2)) {
++            NetLoginHandler.logger.info("User connected via 1.1.0.6+"); //LilyBukkit - additional output
++            this.ROSEVersion = 2;
 +        } else {
 +            NetLoginHandler.logger.info("User isn't using Rosepad"); //LilyBukkit - additional output
 +        }
@@ -168,7 +171,7 @@
 +            return;
          }
          final int minVersion = Integer.min(this.ULPPVersion, 1);
-@@ -119,11 +143,12 @@
+@@ -119,11 +146,12 @@
          this.mcServer.networkServer.addPlayer(ULPPLoginServerHandler);
          ULPPLoginServerHandler.sendPacket(new Packet4UpdateTime(this.mcServer.worldMngr.worldTime));
 +        NetLoginHandler.logger.info(this.username + " authenticated using ULPP");
@@ -183,7 +186,7 @@
 +        if (this.ULPPVersion == 1 && this.mcServer.ULPPOnlineMode) {
              this.netManager.addToSendQueue(new Packet1Login("", this.mcServer.serverId, usedULPPVer));
              return;
-@@ -131,10 +156,9 @@
+@@ -131,10 +159,9 @@
          final EntityPlayerMP entityPlayerMP2 = this.mcServer.configManager.login(this, loginPacket.username, loginPacket.password, false);
          if (entityPlayerMP2 != null) {
 -            NetLoginHandler.logger.info(String.valueOf(this.getUserAndIPString()) + " logged in with ULPP" + Integer.toString(this.ULPPVersion));
@@ -196,7 +199,7 @@
 +            } else {
                  netServerHandler3 = ULPPManager.CreateServerHandler(minVersion, this.mcServer, this.netManager, entityPlayerMP2);
              }
-@@ -149,24 +173,24 @@
+@@ -149,24 +176,24 @@
          this.finishedProcessing = true;
      }
 -    

diff --git a/server/patches/net/minecraft/src/ULPPManager.java.diff b/server/patches/net/minecraft/src/ULPPManager.java.diff
@@ -1,6 +1,6 @@
 --- ULPPManager.java
 +++ ULPPManager.java
-@@ -3,26 +3,67 @@
+@@ -3,26 +3,66 @@
  import net.minecraft.server.MinecraftServer;
 
 +import java.util.ArrayList;
@@ -46,9 +46,8 @@
 +        List<ULPPExtension> extensions = getProtocolExtensions(ver);
 +        for (ULPPExtension ext : extensions) {
 +            if (ext.getName().equals(extension)) {
-+                if (ext.getVersion() < versionNumberMin)
-+                    return false;
-+                else return ext.getVersion() <= versionNumberMax;
++                NetLoginHandler.logger.info("From" + ver + " " + extension + ":" + ext.getVersion());
++                return !(ext.getVersion() < versionNumberMin && ext.getVersion() > versionNumberMax);
 +            }
 +        }
 +        return false;
@@ -84,7 +83,7 @@
 +
      public static NetServerHandler CreateServerHandler(final int version, final MinecraftServer mc, final NetworkManager netManager, final EntityPlayerMP entityPlayer) {
          switch (version) {
-@@ -31,5 +72,5 @@
+@@ -31,5 +71,5 @@
              }
              default: {
 -                throw new RuntimeException(new StringBuilder("Unknown ULPP version ").append(Integer.toString(version)).toString());

diff --git a/server/src/main/java/ru/vladthemountain/lilybukkit/LilyBukkit.java b/server/src/main/java/ru/vladthemountain/lilybukkit/LilyBukkit.java
@@ -6,7 +6,6 @@
 import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.PropertyManager;
 import net.minecraft.src.ServerConfigurationManager;
 import net.minecraft.src.WorldServer;
@@ -47,7 +46,6 @@
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.error.MarkedYAMLException;
 import ru.vladthemountain.lilybukkit.command.ColouredConsoleSender;
-import ru.vladthemountain.lilybukkit.entity.LBPlayer;
 import ru.vladthemountain.lilybukkit.util.UpdateChecker;
 
 import java.io.File;
@@ -134,7 +132,7 @@ public String getName() {
      */
     @Override
     public String getVersion() {
-        return "Alpha 1.2.0.0";
+        return "Alpha 1.2.0.1";
     }
 
     /**
@@ -246,7 +244,9 @@ public String getUpdateFolder() {
 
     @Override
     public File getUpdateFolderFile() {
-        return new File(this.getUpdateFolder());
+        File folder = MinecraftServer.INSTANCE.getFile(this.getUpdateFolder());
+        if (!folder.exists()) folder.mkdir();
+        return folder;
     }
 
     /**
@@ -886,7 +886,7 @@ protected void CRAFTBUKKIT_loadConfig() {
         configuration.getString("settings.permissions-file", "permissions.yml");
 
         if (configuration.getNode("aliases") == null) {
-            List<String> icanhasbukkit = new ArrayList<String>();
+            List<String> icanhasbukkit = new ArrayList<>();
             icanhasbukkit.add("version");
             configuration.setProperty("aliases.icanhasbukkit", icanhasbukkit);
         }