From 4a608d1fc1042606dff9e485f66d6ab63b868fe5 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 9 May 2016 18:45:19 +0200 Subject: [PATCH] more testing for #21 --- .../MineTweakerImplementationAPI.java | 1 - .../java/minetweaker/runtime/MTTweaker.java | 30 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index bdca206..c47afb3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -643,7 +643,6 @@ public class MineTweakerImplementationAPI { // } MineTweakerAPI.tweaker.rollback(); - if (MineTweakerAPI.server != null) { if (!MineTweakerAPI.server.isCommandAdded("minetweaker")) { server.addCommand("minetweaker", "", new String[]{"mt"}, new ICommandFunction() { diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java index 1316c13..4b8a56c 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java @@ -6,30 +6,25 @@ package minetweaker.runtime; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.runtime.providers.ScriptProviderMemory; import stanhebben.zenscript.ZenModule; -import static stanhebben.zenscript.ZenModule.compileScripts; -import static stanhebben.zenscript.ZenModule.extractClassName; import stanhebben.zenscript.ZenParsedFile; import stanhebben.zenscript.ZenTokener; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.parser.ParseException; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.*; + +import static stanhebben.zenscript.ZenModule.compileScripts; +import static stanhebben.zenscript.ZenModule.extractClassName; + /** * * @@ -87,8 +82,11 @@ public class MTTweaker implements ITweaker { MineTweakerAPI.logInfo(action.describeUndo()); action.undo(); } else { - MineTweakerAPI.logInfo("[Stuck] " + action.describe()); - stuck.add(0, action); + MineTweakerAPI.logInfo("[Stuck] 1 " + action.describe()); + MineTweakerAPI.logInfo("[Stuck] 2 " + action.describeUndo()); + MineTweakerAPI.logInfo("[Stuck] 3 " + action.toString()); + + stuck.add(0, action); wereStuck.add(action); Object overrideKey = action.getOverrideKey();