keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

A proper console command handler, also fix ordering of loaded mods

This commit is contained in:
Christian Weeks 2012-04-08 09:55:56 -04:00
parent 07437b95ae
commit 33f1e26df4
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fml/common/cpw/mods/fml/common/IConsoleHandler.java
View File

@ -20,5 +20,5 @@ package cpw.mods.fml.common;
*/
public interface IConsoleHandler
{
public boolean handleCommand(String command);
public boolean handleCommand(String command, Object... data);
}

2
fml/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch
View File

@ -14,7 +14,7 @@
}
}
- else
+ else if (!FMLServerHandler.instance().handleServerCommand(var2))
+ else if (!FMLServerHandler.instance().handleServerCommand(var2, var6.func_1_c(), var6))
{
field_22117_a.info("Unknown console command. Type \"help\" for help.");
}

5
fml/server/cpw/mods/fml/server/FMLServerHandler.java
View File

@ -26,6 +26,7 @@ import net.minecraft.src.CommonRegistry;
import net.minecraft.src.EntityItem;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IChunkProvider;
import net.minecraft.src.ICommandListener;
import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack;
import net.minecraft.src.NetworkManager;
@ -445,10 +446,10 @@ public class FMLServerHandler implements IFMLSidedHandler
* @param var2
* @return
*/
public boolean handleServerCommand(String command)
public boolean handleServerCommand(String command, String player, ICommandListener listener)
{
for (ModContainer mod : Loader.getModList()) {
if (mod.wantsConsoleCommands() && mod.getConsoleHandler().handleCommand(command)) {
if (mod.wantsConsoleCommands() && mod.getConsoleHandler().handleCommand(command, player, listener)) {
return true;
}
}

4
fml/server/cpw/mods/fml/server/ModLoaderModContainer.java
View File

@ -450,7 +450,7 @@ public class ModLoaderModContainer implements ModContainer
}
@Override
public List<String> getPreDepends()
public List<String> getPostDepends()
{
if (dependencies == null)
{
@ -461,7 +461,7 @@ public class ModLoaderModContainer implements ModContainer
}
@Override
public List<String> getPostDepends()
public List<String> getPreDepends()
{
if (dependencies == null)
{

22
fml/server/net/minecraft/src/BaseMod.java
View File

@ -84,19 +84,10 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
}
@Override
public final boolean handleCommand(String command)
public final boolean handleCommand(String command, Object... data)
{
return onServerCommand(command);
return onServerCommand(command, (String)data[0], (ICommandListener)data[1]);
}
/**
* @param command
* @return
*/
private boolean onServerCommand(String command)
{
return false;
}
// BASEMOD API
/**
* Override if you wish to provide a fuel item for the furnace and return the fuel value of the item
@ -281,6 +272,15 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
{
return false;
}
/**
* @param command
* @return
*/
public boolean onServerCommand(String command, String sender, ICommandListener listener)
{
return false;
}
// Spare client junk
// -------
// void addRenderer(Map<Class<? extends Entity>, Render> renderers);