Merge pull request #4 from Dereku/reindevpatches

ReIndevPatches compatibility update

Author: Fox2Code

api/src/main/java/net/minecraft/server/command/Command.java

@@ -3,30 +3,11 @@
 // https://git.derekunavailable.direct/Dereku/ReIndevPatches
 public abstract class Command {
 
-    private final String commandLabel;
-    private final String[] aliases;
-    private IssuerRole canUseThisCommand = IssuerRole.BOTH;
-
-    public Command(final String name) {
-        this.commandLabel = name;
-        this.aliases = new String[0];
-    }
-
     public Command(final String name, final String[] aliases) {
-        this.commandLabel = name;
-        this.aliases = aliases;
     }
 
     public abstract void execute(String commandLabel, String[] args, CommandSender commandSender);
 
-    public String getCommandLabel() {
-        return commandLabel;
-    }
-
-    public String[] getAliases() {
-        return aliases;
-    }
-
     public boolean onlyForOperators() {
         return true;
     }
@@ -35,19 +16,7 @@ public boolean hideCommandArgs() {
         return false;
     }
 
-    public IssuerRole getRoleToUseThisCommand() {
-        return canUseThisCommand;
-    }
-
+    @SuppressWarnings({"unused", "SameParameterValue"})
     protected final void setIssuerRole(IssuerRole role) {
-        this.canUseThisCommand = role;
-    }
-
-    protected final int parseInt(String input, int value) {
-        if (input.matches("-?[0-9]*")) {
-            return Integer.parseInt(input);
-        } else {
-            return value;
-        }
     }
 }

api/src/main/java/net/minecraft/server/command/CommandRegistry.java

@@ -1,7 +1,5 @@
 package net.minecraft.server.command;
 
-import net.minecraft.server.plugin.JavaPlugin;
-
 public class CommandRegistry {
     private static final CommandRegistry INSTANCE = new CommandRegistry();
 
@@ -11,7 +9,6 @@ public static CommandRegistry getInstance() {
         return INSTANCE;
     }
 
-    public boolean registerCommand(JavaPlugin owner, Command command, boolean override) {
-        return true;
+    public void registerCommand(String label, Command command) {
     }
 }

api/src/main/java/net/minecraft/server/command/CommandSender.java

@@ -9,5 +9,8 @@ public boolean isPlayer() {
 
     public void sendMessage(String message) {}
 
-    /* public EntityPlayerMP getPlayer(); */
+    // It's fine, I swear.
+    public Object getPlayer() {
+        return null;
+    }
 }

api/src/main/java/net/minecraft/server/plugin/JavaPlugin.java

@@ -4,38 +4,20 @@
 import com.fox2code.foxloader.network.NetworkPlayer;
 import com.fox2code.foxloader.registry.CommandCompat;
 import net.minecraft.server.command.Command;
+import net.minecraft.server.command.CommandRegistry;
 import net.minecraft.server.command.CommandSender;
 import net.minecraft.server.command.IssuerRole;
-import net.minecraft.server.plugin.JavaPlugin;
-
-import java.lang.reflect.Method;
 
 /**
  * Compatibility class used in ReIndevPatches
  */
 public class ServerCommandWrapper4ReIndevPatches extends Command {
-    private static final Method getPlayer;
-    static  {
-        Method getPlayerTmp;
-        try {
-            //noinspection JavaReflectionMemberAccess
-            getPlayerTmp = CommandSender.class.getDeclaredMethod("getPlayer");
-        } catch (NoSuchMethodException e) {
-            try {
-                //noinspection JavaReflectionMemberAccess
-                getPlayerTmp = CommandSender.class.getDeclaredMethod("getCommandSender");
-            } catch (NoSuchMethodException e2) {
-                throw new RuntimeException("Not ReIndevPatches?", e);
-            }
-        }
-        getPlayer = getPlayerTmp;
-    }
 
     private final CommandCompat commandCompat;
 
     private ServerCommandWrapper4ReIndevPatches(CommandCompat commandCompat) {
         super(commandCompat.getName(), commandCompat.getAliases());
-        this.setIssuerRole(IssuerRole.PLAYER); // We don't support console :(
+        this.setIssuerRole(IssuerRole.PLAYER); // We don't support console :( // Sad to read :(
         this.commandCompat = commandCompat;
     }
 
@@ -44,7 +26,7 @@ public void execute(String commandLabel, String[] args, CommandSender commandSen
         NetworkPlayer networkPlayer = null;
         if (commandSender.isPlayer()) {
             try {
-                networkPlayer = (NetworkPlayer) getPlayer.invoke(commandSender);
+                networkPlayer = (NetworkPlayer) commandSender.getPlayer();
             } catch (Exception ignored) {}
         }
         if (networkPlayer == null) {
@@ -67,21 +49,11 @@ public boolean hideCommandArgs() {
         return this.commandCompat.isHidden();
     }
 
-    private static final JavaPlugin foxLoaderJavaPlugin = new JavaPlugin() {
-        @SuppressWarnings("deprecation")
-        @Override
-        public String getName() {
-            return "FoxLoader";
-        }
-    };
-
     public static void registerAllForReIndevPatches() {
         if (!ModLoader.areAllModsLoaded()) // Just a safeguard, just in case.
             throw new IllegalArgumentException("Not Loaded?");
         for (CommandCompat commandCompat : CommandCompat.commands.values()) {
-            if (!foxLoaderJavaPlugin.registerCommand(new ServerCommandWrapper4ReIndevPatches(commandCompat), true)) {
-                ModLoader.getModLoaderLogger().warning("Failed to register /" + commandCompat.getName() + " command");
-            }
+            CommandRegistry.getInstance().registerCommand(commandCompat.getName(), new ServerCommandWrapper4ReIndevPatches(commandCompat));
         }
     }
 }