From d9423a4f25d1e431220979af00105048eb9e7039 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 15 Aug 2012 02:01:38 -0700 Subject: [PATCH] New Command event. --- .../minecraftforge/event/CommandEvent.java | 21 ++++++++++++ .../minecraft/src/CommandHandler.java.patch | 32 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 common/net/minecraftforge/event/CommandEvent.java create mode 100644 patches/common/net/minecraft/src/CommandHandler.java.patch diff --git a/common/net/minecraftforge/event/CommandEvent.java b/common/net/minecraftforge/event/CommandEvent.java new file mode 100644 index 0000000000..6d3a6b8202 --- /dev/null +++ b/common/net/minecraftforge/event/CommandEvent.java @@ -0,0 +1,21 @@ +package net.minecraftforge.event; + +import net.minecraft.src.ICommand; +import net.minecraft.src.ICommandSender; + +@Cancelable +public class CommandEvent extends Event +{ + + public final ICommand command; + public final ICommandSender sender; + public String[] parameters; + public Throwable exception; + + public CommandEvent(ICommand command, ICommandSender sender, String[] parameters) + { + this.command = command; + this.sender = sender; + this.parameters = parameters; + } +} diff --git a/patches/common/net/minecraft/src/CommandHandler.java.patch b/patches/common/net/minecraft/src/CommandHandler.java.patch new file mode 100644 index 0000000000..9815e76be6 --- /dev/null +++ b/patches/common/net/minecraft/src/CommandHandler.java.patch @@ -0,0 +1,32 @@ +--- ../src_base/common/net/minecraft/src/CommandHandler.java ++++ ../src_work/common/net/minecraft/src/CommandHandler.java +@@ -8,6 +8,9 @@ + import java.util.Map; + import java.util.Set; + import java.util.Map.Entry; ++ ++import net.minecraftforge.common.MinecraftForge; ++import net.minecraftforge.event.CommandEvent; + + public class CommandHandler implements ICommandManager + { +@@ -38,7 +41,18 @@ + + if (var5.canCommandSenderUseCommand(par1ICommandSender)) + { +- var5.processCommand(par1ICommandSender, var3); ++ CommandEvent event = new CommandEvent(var5, par1ICommandSender, var3); ++ if (!MinecraftForge.EVENT_BUS.post(event)) ++ { ++ var5.processCommand(par1ICommandSender, event.parameters); ++ } ++ else ++ { ++ if (event.exception != null) ++ { ++ throw event.exception; ++ } ++ } + } + else + {