Update to 1.8.9, renamed jar, added Rcon support

This commit is contained in:
Jared committed 2016-01-22 17:39:47 +02:00
1 parent d3b5a8f958
commit d1eecc5d45
8 files changed
+602 -346

No files matched your search

@@ -6,22 +6,24 @@
package minetweaker.mc1710.brackets;
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import minetweaker.IBracketHandler;
import minetweaker.MineTweakerAPI;
import minetweaker.annotations.BracketHandler;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IngredientAny;
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
import net.minecraft.item.Item;
import net.minecraftforge.oredict.OreDictionary;
import stanhebben.zenscript.ZenTokener;
import stanhebben.zenscript.compiler.IEnvironmentGlobal;
import stanhebben.zenscript.expression.ExpressionInt;
import stanhebben.zenscript.expression.ExpressionCallStatic;
import stanhebben.zenscript.expression.ExpressionInt;
import stanhebben.zenscript.expression.ExpressionString;
import stanhebben.zenscript.expression.partial.IPartialExpression;
import stanhebben.zenscript.parser.Token;
@@ -0,0 +1,123 @@
package minetweaker.mc1710.player;
import minetweaker.MineTweakerAPI;
import minetweaker.api.chat.IChatMessage;
import minetweaker.api.data.IData;
import minetweaker.api.item.IItemStack;
import minetweaker.api.player.IPlayer;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
/**
*
* @author Jared
*/
public class RconPlayer implements IPlayer {
private final ICommandSender sender;
public RconPlayer(ICommandSender sender) {
this.sender = sender;
}
public ICommandSender getInternal() {
return sender;
}
@Override
public String getId() {
return null; // TODO: we should be having this for MC 1.7.10, right?
}
@Override
public String getName() {
return sender.getCommandSenderName();
}
@Override
public IData getData() {
return null;
}
@Override
public void update(IData data) {
}
@Override
public void sendChat(IChatMessage message) {
Object internal = message.getInternal();
if (!(internal instanceof IChatComponent)) {
MineTweakerAPI.logError("not a valid chat message");
return;
}
sender.addChatMessage((IChatComponent) internal);
}
@Override
public void sendChat(String message) {
sender.addChatMessage(new ChatComponentText(message));
}
@Override
public int getHotbarSize() {
return 0;
}
@Override
public IItemStack getHotbarStack(int i) {
return null;
}
@Override
public int getInventorySize() {
return 0;
}
@Override
public IItemStack getInventoryStack(int i) {
return null;
}
@Override
public IItemStack getCurrentItem() {
return null;
}
@Override
public boolean isCreative() {
return false;
}
@Override
public boolean isAdventure() {
return false;
}
@Override
public void openBrowser(String url) {
}
@Override
public void copyToClipboard(String value) {
}
@Override
public boolean equals(Object other) {
if (other.getClass() != this.getClass())
return false;
return ((RconPlayer) other).sender == sender;
}
@Override
public int hashCode() {
int hash = 5;
hash = 23 * hash + (this.sender != null ? this.sender.hashCode() : 0);
return hash;
}
@Override
public void give(IItemStack stack) {
}
}
@@ -8,6 +8,7 @@ package minetweaker.mc1710.server;
import java.util.Arrays;
import java.util.List;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.api.minecraft.MineTweakerMC;
@@ -16,10 +17,12 @@ import minetweaker.api.server.AbstractServer;
import minetweaker.api.server.ICommandFunction;
import minetweaker.api.server.ICommandTabCompletion;
import minetweaker.api.server.ICommandValidator;
import minetweaker.mc1710.player.RconPlayer;
import net.minecraft.command.CommandHandler;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.rcon.RConConsoleSource;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.management.UserListOps;
@@ -29,205 +32,207 @@ import net.minecraft.server.management.UserListOps;
* @author Stan
*/
public class MCServer extends AbstractServer {
private final MinecraftServer server;
private final MinecraftServer server;
public MCServer(MinecraftServer server) {
this.server = server;
}
public MCServer(MinecraftServer server) {
this.server = server;
}
@Override
public void addCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
ICommand command = new MCCommand(name, usage, aliases, function, validator, completion);
MineTweakerAPI.apply(new AddCommandAction(command));
}
@Override
public void addCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
ICommand command = new MCCommand(name, usage, aliases, function, validator, completion);
MineTweakerAPI.apply(new AddCommandAction(command));
}
@Override
public void removeCommand(String name) {
ICommand command = (ICommand) ((CommandHandler) server.getCommandManager()).getCommands().get(name);
if (command == null) {
MineTweakerAPI.logWarning("No such command: " + name);
} else {
MineTweakerAPI.apply(new RemoveCommandAction(command));
}
}
@Override
public void removeCommand(String name) {
ICommand command = (ICommand) ((CommandHandler) server.getCommandManager()).getCommands().get(name);
if (command == null) {
MineTweakerAPI.logWarning("No such command: " + name);
} else {
MineTweakerAPI.apply(new RemoveCommandAction(command));
}
}
@Override
public boolean isOp(IPlayer player) {
if (player == ServerPlayer.INSTANCE)
return true;
@Override
public boolean isOp(IPlayer player) {
if (player == ServerPlayer.INSTANCE)
return true;
UserListOps ops = MinecraftServer.getServer().getConfigurationManager().func_152603_m();
if (server.isDedicatedServer() && ops != null) {
return ops.func_152690_d() || ops.func_152700_a(player.getName()) != null;
} else {
return true;
}
}
UserListOps ops = MinecraftServer.getServer().getConfigurationManager().func_152603_m();
if (server.isDedicatedServer() && ops != null) {
return ops.func_152690_d() || ops.func_152700_a(player.getName()) != null || player instanceof RconPlayer;
} else {
return true;
}
}
private static IPlayer getPlayer(ICommandSender commandSender) {
if (commandSender instanceof EntityPlayer) {
return MineTweakerMC.getIPlayer((EntityPlayer) commandSender);
} else if (commandSender instanceof DedicatedServer) {
return ServerPlayer.INSTANCE;
} else {
System.out.println("Unsupported command sender: " + commandSender);
System.out.println("player name: " + commandSender.getCommandSenderName());
return null;
}
}
private static IPlayer getPlayer(ICommandSender commandSender) {
if (commandSender instanceof EntityPlayer) {
return MineTweakerMC.getIPlayer((EntityPlayer) commandSender);
} else if (commandSender instanceof DedicatedServer) {
return ServerPlayer.INSTANCE;
} else if (commandSender instanceof RConConsoleSource) {
return new RconPlayer(commandSender);
} else {
System.out.println("Unsupported command sender: " + commandSender);
System.out.println("player name: " + commandSender.getCommandSenderName());
return null;
}
}
private static void removeCommand(ICommand command) {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.getCommands().remove(command.getCommandName());
private static void removeCommand(ICommand command) {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.getCommands().remove(command.getCommandName());
if (command.getCommandAliases() != null) {
for (String alias : (List<String>) command.getCommandAliases()) {
ch.getCommands().remove(alias);
}
}
}
if (command.getCommandAliases() != null) {
for (String alias : (List<String>) command.getCommandAliases()) {
ch.getCommands().remove(alias);
}
}
}
private class MCCommand implements ICommand {
private final String name;
private final String usage;
private final List<String> aliases;
private final ICommandFunction function;
private final ICommandValidator validator;
private final ICommandTabCompletion completion;
private class MCCommand implements ICommand {
private final String name;
private final String usage;
private final List<String> aliases;
private final ICommandFunction function;
private final ICommandValidator validator;
private final ICommandTabCompletion completion;
public MCCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
this.name = name;
this.usage = usage;
this.aliases = Arrays.asList(aliases);
this.function = function;
this.validator = validator;
this.completion = completion;
}
public MCCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
this.name = name;
this.usage = usage;
this.aliases = Arrays.asList(aliases);
this.function = function;
this.validator = validator;
this.completion = completion;
}
@Override
public String getCommandName() {
return name;
}
@Override
public String getCommandName() {
return name;
}
@Override
public String getCommandUsage(ICommandSender var1) {
return usage;
}
@Override
public String getCommandUsage(ICommandSender var1) {
return usage;
}
@Override
public List getCommandAliases() {
return aliases;
}
@Override
public List getCommandAliases() {
return aliases;
}
@Override
public void processCommand(ICommandSender var1, String[] var2) {
function.execute(var2, getPlayer(var1));
}
@Override
public void processCommand(ICommandSender var1, String[] var2) {
function.execute(var2, getPlayer(var1));
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender var1) {
if (validator == null) {
return true;
} else {
return validator.canExecute(getPlayer(var1));
}
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender var1) {
if (validator == null) {
return true;
} else {
return validator.canExecute(getPlayer(var1));
}
}
@Override
public List addTabCompletionOptions(ICommandSender var1, String[] var2) {
if (completion != null) {
return Arrays.asList(completion.getTabCompletionOptions(var2, getPlayer(var1)));
} else {
return null;
}
}
@Override
public List addTabCompletionOptions(ICommandSender var1, String[] var2) {
if (completion != null) {
return Arrays.asList(completion.getTabCompletionOptions(var2, getPlayer(var1)));
} else {
return null;
}
}
@Override
public boolean isUsernameIndex(String[] var1, int var2) {
return false;
}
@Override
public boolean isUsernameIndex(String[] var1, int var2) {
return false;
}
@Override
public int compareTo(Object o) {
return 0;
}
}
@Override
public int compareTo(Object o) {
return 0;
}
}
private class AddCommandAction implements IUndoableAction {
private final ICommand command;
private class AddCommandAction implements IUndoableAction {
private final ICommand command;
public AddCommandAction(ICommand command) {
this.command = command;
}
public AddCommandAction(ICommand command) {
this.command = command;
}
@Override
public void apply() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public void apply() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void undo() {
removeCommand(command);
}
@Override
public void undo() {
removeCommand(command);
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public Object getOverrideKey() {
return null;
}
}
private class RemoveCommandAction implements IUndoableAction {
private final ICommand command;
private class RemoveCommandAction implements IUndoableAction {
private final ICommand command;
public RemoveCommandAction(ICommand command) {
this.command = command;
}
public RemoveCommandAction(ICommand command) {
this.command = command;
}
@Override
public void apply() {
removeCommand(command);
}
@Override
public void apply() {
removeCommand(command);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void undo() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public void undo() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public Object getOverrideKey() {
return null;
}
}
}
+1 -1
View File
@@ -18,7 +18,7 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.8-" + ext.mineTweakerVersion
version = "1.8.9-" + ext.mineTweakerVersion
archivesBaseName = project.projectDir.name
minecraft {
@@ -0,0 +1,123 @@
package minetweaker.mc18.player;
import minetweaker.MineTweakerAPI;
import minetweaker.api.chat.IChatMessage;
import minetweaker.api.data.IData;
import minetweaker.api.item.IItemStack;
import minetweaker.api.player.IPlayer;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
/**
*
* @author Jared
*/
public class RconPlayer implements IPlayer {
private final ICommandSender sender;
public RconPlayer(ICommandSender sender) {
this.sender = sender;
}
public ICommandSender getInternal() {
return sender;
}
@Override
public String getId() {
return null; // TODO: we should be having this for MC 1.7.10, right?
}
@Override
public String getName() {
return sender.getName();
}
@Override
public IData getData() {
return null;
}
@Override
public void update(IData data) {
}
@Override
public void sendChat(IChatMessage message) {
Object internal = message.getInternal();
if (!(internal instanceof IChatComponent)) {
MineTweakerAPI.logError("not a valid chat message");
return;
}
sender.addChatMessage((IChatComponent) internal);
}
@Override
public void sendChat(String message) {
sender.addChatMessage(new ChatComponentText(message));
}
@Override
public int getHotbarSize() {
return 0;
}
@Override
public IItemStack getHotbarStack(int i) {
return null;
}
@Override
public int getInventorySize() {
return 0;
}
@Override
public IItemStack getInventoryStack(int i) {
return null;
}
@Override
public IItemStack getCurrentItem() {
return null;
}
@Override
public boolean isCreative() {
return false;
}
@Override
public boolean isAdventure() {
return false;
}
@Override
public void openBrowser(String url) {
}
@Override
public void copyToClipboard(String value) {
}
@Override
public boolean equals(Object other) {
if (other.getClass() != this.getClass())
return false;
return ((RconPlayer) other).sender == sender;
}
@Override
public int hashCode() {
int hash = 5;
hash = 23 * hash + (this.sender != null ? this.sender.hashCode() : 0);
return hash;
}
@Override
public void give(IItemStack stack) {
}
}
@@ -17,11 +17,13 @@ import minetweaker.api.server.AbstractServer;
import minetweaker.api.server.ICommandFunction;
import minetweaker.api.server.ICommandTabCompletion;
import minetweaker.api.server.ICommandValidator;
import minetweaker.mc18.player.RconPlayer;
import net.minecraft.command.CommandException;
import net.minecraft.command.CommandHandler;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.rcon.RConConsoleSource;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.management.UserListOps;
@@ -32,207 +34,208 @@ import net.minecraft.util.BlockPos;
* @author Stan
*/
public class MCServer extends AbstractServer {
private final MinecraftServer server;
private final MinecraftServer server;
public MCServer(MinecraftServer server) {
this.server = server;
}
public MCServer(MinecraftServer server) {
this.server = server;
}
@Override
public void addCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
ICommand command = new MCCommand(name, usage, aliases, function, validator, completion);
MineTweakerAPI.apply(new AddCommandAction(command));
}
@Override
public void addCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
ICommand command = new MCCommand(name, usage, aliases, function, validator, completion);
MineTweakerAPI.apply(new AddCommandAction(command));
}
@Override
public void removeCommand(String name) {
ICommand command = (ICommand) ((CommandHandler) server.getCommandManager()).getCommands().get(name);
if (command == null) {
MineTweakerAPI.logWarning("No such command: " + name);
} else {
MineTweakerAPI.apply(new RemoveCommandAction(command));
}
}
@Override
public void removeCommand(String name) {
ICommand command = (ICommand) ((CommandHandler) server.getCommandManager()).getCommands().get(name);
if (command == null) {
MineTweakerAPI.logWarning("No such command: " + name);
} else {
MineTweakerAPI.apply(new RemoveCommandAction(command));
}
}
@Override
public boolean isOp(IPlayer player) {
if (player == ServerPlayer.INSTANCE)
return true;
@Override
public boolean isOp(IPlayer player) {
if (player == ServerPlayer.INSTANCE)
return true;
UserListOps ops = MinecraftServer.getServer().getConfigurationManager().getOppedPlayers();
if (server.isDedicatedServer()) {
return ops.getKeys().length>0 || ops.getGameProfileFromName(player.getName()) != null;
} else {
return true;
}
}
UserListOps ops = MinecraftServer.getServer().getConfigurationManager().getOppedPlayers();
if (server.isDedicatedServer() && ops != null) {
return ops.getKeys().length > 0 || ops.getGameProfileFromName(player.getName()) != null || player instanceof RconPlayer;
} else {
return true;
}
}
private static IPlayer getPlayer(ICommandSender commandSender) {
if (commandSender instanceof EntityPlayer) {
return MineTweakerMC.getIPlayer((EntityPlayer) commandSender);
} else if (commandSender instanceof DedicatedServer) {
return ServerPlayer.INSTANCE;
} else {
System.out.println("Unsupported command sender: " + commandSender);
System.out.println("player name: " + commandSender.getName());
return null;
}
}
private static IPlayer getPlayer(ICommandSender commandSender) {
if (commandSender instanceof EntityPlayer) {
return MineTweakerMC.getIPlayer((EntityPlayer) commandSender);
} else if (commandSender instanceof DedicatedServer) {
return ServerPlayer.INSTANCE;
} else if (commandSender instanceof RConConsoleSource) {
return new RconPlayer(commandSender);
} else {
System.out.println("Unsupported command sender: " + commandSender);
System.out.println("player name: " + commandSender.getName());
return null;
}
}
private static void removeCommand(ICommand command) {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.getCommands().remove(command.getCommandName());
private static void removeCommand(ICommand command) {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.getCommands().remove(command.getCommandName());
if (command.getCommandAliases() != null) {
for (String alias : (List<String>) command.getCommandAliases()) {
ch.getCommands().remove(alias);
}
}
}
if (command.getCommandAliases() != null) {
for (String alias : (List<String>) command.getCommandAliases()) {
ch.getCommands().remove(alias);
}
}
}
private class MCCommand implements ICommand {
private final String name;
private final String usage;
private final List<String> aliases;
private final ICommandFunction function;
private final ICommandValidator validator;
private final ICommandTabCompletion completion;
private class MCCommand implements ICommand {
private final String name;
private final String usage;
private final List<String> aliases;
private final ICommandFunction function;
private final ICommandValidator validator;
private final ICommandTabCompletion completion;
public MCCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
this.name = name;
this.usage = usage;
this.aliases = Arrays.asList(aliases);
this.function = function;
this.validator = validator;
this.completion = completion;
}
public MCCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) {
this.name = name;
this.usage = usage;
this.aliases = Arrays.asList(aliases);
this.function = function;
this.validator = validator;
this.completion = completion;
}
@Override
public String getCommandName() {
return name;
}
@Override
public String getCommandName() {
return name;
}
@Override
public String getCommandUsage(ICommandSender var1) {
return usage;
}
@Override
public String getCommandUsage(ICommandSender var1) {
return usage;
}
@Override
public List getCommandAliases() {
return aliases;
}
@Override
public List getCommandAliases() {
return aliases;
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender var1) {
if (validator == null) {
return true;
} else {
return validator.canExecute(getPlayer(var1));
}
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender var1) {
if (validator == null) {
return true;
} else {
return validator.canExecute(getPlayer(var1));
}
}
@Override
public boolean isUsernameIndex(String[] var1, int var2) {
return false;
}
@Override
public boolean isUsernameIndex(String[] var1, int var2) {
return false;
}
@Override
public int compareTo(ICommand o) {
return 0;
}
@Override
public int compareTo(ICommand o) {
return 0;
}
@Override
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
function.execute(args, getPlayer(sender));
}
@Override
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
function.execute(args, getPlayer(sender));
}
@Override
public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
if (completion != null) {
return Arrays.asList(completion.getTabCompletionOptions(args, getPlayer(sender)));
} else {
return null;
}
}
@Override
public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
if (completion != null) {
return Arrays.asList(completion.getTabCompletionOptions(args, getPlayer(sender)));
} else {
return null;
}
}
}
}
private class AddCommandAction implements IUndoableAction {
private final ICommand command;
private class AddCommandAction implements IUndoableAction {
private final ICommand command;
public AddCommandAction(ICommand command) {
this.command = command;
}
public AddCommandAction(ICommand command) {
this.command = command;
}
@Override
public void apply() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public void apply() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void undo() {
removeCommand(command);
}
@Override
public void undo() {
removeCommand(command);
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public Object getOverrideKey() {
return null;
}
}
private class RemoveCommandAction implements IUndoableAction {
private final ICommand command;
private class RemoveCommandAction implements IUndoableAction {
private final ICommand command;
public RemoveCommandAction(ICommand command) {
this.command = command;
}
public RemoveCommandAction(ICommand command) {
this.command = command;
}
@Override
public void apply() {
removeCommand(command);
}
@Override
public void apply() {
removeCommand(command);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void undo() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public void undo() {
CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager();
ch.registerCommand(command);
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describe() {
return "Adding command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public String describeUndo() {
return "Removing command " + command.getCommandName();
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public Object getOverrideKey() {
return null;
}
}
}
+6 -6
View File
@@ -19,7 +19,7 @@ task assembleMC1710(type: Jar, dependsOn: [\
':ZenScript:build',
':MineTweaker3-API:build']
+ projects1710.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.7.10-${mineTweakerVersion}.jar"
archiveName="CraftTweaker-Customized-1.7.10-${mineTweakerVersion}.jar"
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
@@ -33,7 +33,7 @@ task assembleMC18(type: Jar, dependsOn: [\
':ZenScript:build',
':MineTweaker3-API:build']
+ projects18.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.8.8-${mineTweakerVersion}.jar"
archiveName="CraftTweaker-Customized-1.8.8-${mineTweakerVersion}.jar"
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
@@ -47,7 +47,7 @@ task assembleDevBase1710(type: Jar, dependsOn: [
':ZenScript:build',
':MineTweaker3-API:build',
':MineTweaker3-MC1710-Main:build']) {
archiveName="CraftTweaker-Dev-1.7.10-${mineTweakerVersion}.jar"
archiveName="CraftTweaker-Customized-Dev-1.7.10-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
@@ -58,7 +58,7 @@ task assembleDevBase18(type: Jar, dependsOn: [
':ZenScript:build',
':MineTweaker3-API:build',
':MineTweaker3-MC18-Main:build']) {
archiveName="CraftTweaker-Dev-1.8.8-${mineTweakerVersion}.jar"
archiveName="CraftTweaker-Customized-Dev-1.8.8-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
@@ -69,7 +69,7 @@ task assembleDevFull1710(type: Jar, dependsOn: [
':ZenScript:build',
':MineTweaker3-API:build']
+ projects1710.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.7.10-${mineTweakerVersion}.jar"
archiveName="CraftTweaker-Customized-Dev-Full-1.7.10-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
@@ -83,7 +83,7 @@ task assembleDevFull18(type: Jar, dependsOn: [
':ZenScript:build',
':MineTweaker3-API:build']
+ projects18.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.8.8-${mineTweakerVersion}.jar"
archiveName="CraftTweaker-Customized-Dev-Full-1.8.8-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
+2 -2
View File
@@ -3,7 +3,7 @@
// ### Global settings ###
// #######################
ext.mineTweakerVersion = "3.0.1"
ext.mineTweakerVersion = "3.0.2"
ext.mineTweakerDebug = "false"
ext.javaToolsJar = new File("C:/Program Files/Java/jdk1.8.0_66/lib/tools.jar")
@@ -24,7 +24,7 @@ ext.projects1710 = [
// ### 1.8 settings ###
// ####################
ext.forgeVersion18 = "1.8.8-11.15.0.1641-1.8.8"
ext.forgeVersion18 = "1.8.9-11.15.0.1694"
ext.projects18 = [
'MineTweaker3-MC18-Main',
'MineTweaker3-MC18-Mod-JEI'