diff --git a/build.properties b/build.properties index 3c03851..5d21211 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -mod.version=0.9.7-GTNH +mod.version=0.9.8-GTNH forestry.version=4.1.0.43 diff --git a/src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java b/src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java index abaadeb..38a97cc 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java @@ -1,9 +1,5 @@ package modtweaker2.mods.thaumcraft; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thaumcraft.aspect.AspectStack; @@ -13,6 +9,14 @@ import thaumcraft.api.ThaumcraftApi.EntityTags; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchCategoryList; +import thaumcraft.api.research.ResearchItem; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import static modtweaker2.ModTweaker2.logger; public class ThaumcraftHelper { public static HashMap warpList; @@ -132,4 +136,18 @@ public class ThaumcraftHelper { return (AspectStack) internal; } } + + public static ResearchItem getResearchSafe(String tab, String key) { + final ResearchCategoryList cat = ResearchCategories.researchCategories.get(tab); + if(cat == null) { + logger.error("SCRIPT ERROR: Error, research tab {} doesn't exist", tab); + return null; + } + final ResearchItem research = cat.research.get(key); + if(research == null) { + logger.error("SCRIPT ERROR: Research {} doesn't exist.", key); + return null; + } + return research; + } } diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java index b8d6867..2faaaf2 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java @@ -13,8 +13,10 @@ import thaumcraft.api.crafting.IArcaneRecipe; import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; import thaumcraft.api.research.ResearchPage.PageType; +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; public class AddPage implements IUndoableAction { String key; @@ -110,7 +112,12 @@ public class AddPage implements IUndoableAction { @Override public void undo() { - ResearchCategories.researchCategories.get(tab).research.get(key).setPages(oldPages); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + + research.setPages(oldPages); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java index 7a76f7a..76c39b9 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java @@ -3,6 +3,9 @@ package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; public class AddPrereq implements IUndoableAction { String key; @@ -53,8 +56,13 @@ public class AddPrereq implements IUndoableAction { @Override public void undo() { - if (!hidden) ResearchCategories.researchCategories.get(tab).research.get(key).setParents(oldPrereqs); - else ResearchCategories.researchCategories.get(tab).research.get(key).setParentsHidden(oldPrereqs); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + + if (!hidden) research.setParents(oldPrereqs); + else research.setParentsHidden(oldPrereqs); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java index e8be769..d9683c2 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java @@ -9,6 +9,7 @@ public class AddResearch implements IUndoableAction { String key; String tab; ResearchItem research; + ResearchItem oldResearch; ItemStack[] itemTriggers; String[] entityTriggers; @@ -22,6 +23,7 @@ public class AddResearch implements IUndoableAction { @Override public void apply() { + oldResearch = ResearchCategories.getResearch(research.key); if (itemTriggers != null) { research = research.setItemTriggers(itemTriggers); } @@ -43,7 +45,10 @@ public class AddResearch implements IUndoableAction { @Override public void undo() { - ResearchCategories.researchCategories.get(tab).research.remove(key); + if (oldResearch == null) + ResearchCategories.researchCategories.get(tab).research.remove(key); + else + ResearchCategories.researchCategories.get(tab).research.put(key, oldResearch); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java index c7fa00f..719eb6a 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java @@ -3,6 +3,9 @@ package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; public class AddSibling implements IUndoableAction { String key; @@ -40,7 +43,12 @@ public class AddSibling implements IUndoableAction { @Override public void undo() { - ResearchCategories.researchCategories.get(tab).research.get(key).setSiblings(oldSiblings); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + + research.setSiblings(oldSiblings); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java index 86a552b..8f012c5 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java @@ -3,8 +3,11 @@ package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; + public class ClearPages implements IUndoableAction { String key; String tab; @@ -33,7 +36,12 @@ public class ClearPages implements IUndoableAction { @Override public void undo() { - ResearchCategories.researchCategories.get(tab).research.get(key).setPages(oldPages); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + + research.setPages(oldPages); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java index 5fd9899..012f026 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java @@ -3,6 +3,9 @@ package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; public class ClearPrereqs implements IUndoableAction { String key; @@ -35,8 +38,13 @@ public class ClearPrereqs implements IUndoableAction { @Override public void undo() { - if (prereqs != null) ResearchCategories.researchCategories.get(tab).research.get(key).setParents(prereqs); - if (secretPrereqs != null) ResearchCategories.researchCategories.get(tab).research.get(key).setParentsHidden(secretPrereqs); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + + if (prereqs != null) research.setParents(prereqs); + if (secretPrereqs != null) research.setParentsHidden(secretPrereqs); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java index d24b2a3..c5a0371 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java @@ -3,6 +3,9 @@ package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; public class ClearSiblings implements IUndoableAction { String key; @@ -32,7 +35,12 @@ public class ClearSiblings implements IUndoableAction { @Override public void undo() { - ResearchCategories.researchCategories.get(tab).research.get(key).setSiblings(siblings); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + + research.setSiblings(siblings); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java b/src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java index b2bd873..8ff2dbc 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java @@ -1,18 +1,34 @@ package modtweaker2.mods.thaumcraft.research; -import java.lang.reflect.Field; - import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; +import java.lang.reflect.Field; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; + public class Difficulty implements IUndoableAction { String key; String tab; int difficulty; int oldDif; boolean applied = false; + final static Field complexity; + + static { + Field complexity1; + try { + complexity1 = Class.forName("thaumcraft.api.research.ResearchItem").getDeclaredField("complexity"); + } catch (NoSuchFieldException | ClassNotFoundException e) { + complexity1 = null; + e.printStackTrace(); + } + complexity = complexity1; + } + + public Difficulty(String res, int dif) { key = res; @@ -47,8 +63,10 @@ public class Difficulty implements IUndoableAction { @Override public void undo() { try { - ResearchItem research = ResearchCategories.researchCategories.get(tab).research.get(key); - Field complexity = Class.forName("thaumcraft.api.research.ResearchItem").getDeclaredField("complexity"); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null || complexity == null) { + return; + } complexity.setAccessible(true); complexity.set(research, oldDif); } catch (Exception e) { diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java index 7339287..05578c5 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java @@ -28,30 +28,33 @@ public class MoveResearch implements IUndoableAction { @Override public void apply() { if (oldTab != null) { - ResearchItem research = ResearchCategories.researchCategories.get(oldTab).research.get(key); + ResearchItem research = ResearchCategories.getResearch(key); oldX = research.displayColumn; oldY = research.displayRow; try { - Class res = Class.forName("thaumcraft.api.research.ResearchItem"); - Field ex = res.getField("displayColumn"); - ex.setAccessible(true); - ex.setInt(research, x); - Field wy = res.getField("displayRow"); - wy.setAccessible(true); - wy.setInt(research, y); - Field cat = res.getField("category"); - cat.setAccessible(true); - cat.set(research, newTab); - ResearchCategories.researchCategories.get(oldTab).research.remove(key); - research.registerResearchItem(); + moveResearchItem(research, x, y, newTab, oldTab); moved = true; - } catch (Exception e) { e.printStackTrace(); } } } + private void moveResearchItem(ResearchItem research, int x, int y, String newTab, String tab) throws ReflectiveOperationException { + Class res = Class.forName("thaumcraft.api.research.ResearchItem"); + Field ex = res.getField("displayColumn"); + ex.setAccessible(true); + ex.setInt(research, x); + Field wy = res.getField("displayRow"); + wy.setAccessible(true); + wy.setInt(research, y); + Field cat = res.getField("category"); + cat.setAccessible(true); + cat.set(research, newTab); + ResearchCategories.researchCategories.get(tab).research.remove(key); + research.registerResearchItem(); + } + @Override public String describe() { return "Moving Research " + key + " to " + newTab; @@ -64,24 +67,13 @@ public class MoveResearch implements IUndoableAction { @Override public void undo() { - ResearchItem research = ResearchCategories.researchCategories.get(oldTab).research.get(key); + ResearchItem research = ResearchCategories.getResearch(key); try { - Class res = Class.forName("thaumcraft.api.research.ResearchItem"); - Field ex = res.getField("displayColumn"); - ex.setAccessible(true); - ex.setInt(research, oldX); - Field wy = res.getField("displayRow"); - wy.setAccessible(true); - wy.setInt(research, oldY); - Field cat = res.getField("category"); - cat.setAccessible(true); - cat.set(research, oldTab); - ResearchCategories.researchCategories.get(newTab).research.remove(key); - research.registerResearchItem(); - + moveResearchItem(research, oldX, oldY, oldTab, newTab); } catch (Exception e) { e.printStackTrace(); } + moved = false; } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java index 8089006..b71f3ea 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java @@ -1,67 +1,59 @@ package modtweaker2.mods.thaumcraft.research; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.HashSet; +import java.util.Map.Entry; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Function; import minetweaker.IUndoableAction; +import modtweaker2.helpers.LogHelper; +import org.apache.commons.lang3.ArrayUtils; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchCategoryList; +import thaumcraft.api.research.ResearchItem; public class OrphanResearch implements IUndoableAction { String key; - HashMap children = new HashMap(); - HashMap secretChildren = new HashMap(); - HashMap siblings = new HashMap(); + private final Set children = new HashSet<>(); + private final Set secretChildren = new HashSet<>(); + private final Set siblings = new HashSet<>(); public OrphanResearch(String victim) { key = victim; } + private void remove(String cur, String[] refs, Set set, Consumer consumer) { + if (refs == null) return; + for (int i = 0; i < refs.length; i++) { + if (refs[i] != null && refs[i].equals(key)) { + set.add(cur); + consumer.accept(ArrayUtils.remove(refs, i)); + return; + } + } + } + + private void add(Set set, Function function, BiConsumer consumer) { + for (String research : set) { + ResearchItem researchItem = ResearchCategories.getResearch(research); + if (researchItem == null) + LogHelper.logWarning("Missing research: " + research); + else + consumer.accept(researchItem, ArrayUtils.add(function.apply(researchItem), key)); + } + } + @Override public void apply() { - for (String tab : ResearchCategories.researchCategories.keySet()) { - for (String research : ResearchCategories.researchCategories.get(tab).research.keySet()) { - String[] prereqs = ResearchCategories.researchCategories.get(tab).research.get(research).parents; - if (prereqs != null) { - for (int x = 0; x < prereqs.length; x++) { - if (prereqs[x] != null && prereqs[x].equals(key)) { - children.put(research, tab); - ArrayList newReqs = new ArrayList(); - for (int y = 0; y < prereqs.length; y++) { - if (y != x) newReqs.add(prereqs[y]); - } - ResearchCategories.researchCategories.get(tab).research.get(research).setParents(newReqs.toArray(new String[prereqs.length - 1])); - break; - } - } - } - prereqs = ResearchCategories.researchCategories.get(tab).research.get(research).parentsHidden; - if (prereqs != null) { - for (int x = 0; x < prereqs.length; x++) { - if (prereqs[x] != null && prereqs[x].equals(key)) { - secretChildren.put(research, tab); - ArrayList newReqs = new ArrayList(); - for (int y = 0; y < prereqs.length; y++) { - if (y != x) newReqs.add(prereqs[y]); - } - ResearchCategories.researchCategories.get(tab).research.get(research).setParentsHidden(newReqs.toArray(new String[prereqs.length - 1])); - break; - } - } - } - prereqs = ResearchCategories.researchCategories.get(tab).research.get(research).siblings; - if (prereqs != null) { - for (int x = 0; x < prereqs.length; x++) { - if (prereqs[x] != null && prereqs[x].equals(key)) { - siblings.put(research, tab); - ArrayList newReqs = new ArrayList(); - for (int y = 0; y < prereqs.length; y++) { - if (y != x) newReqs.add(prereqs[y]); - } - ResearchCategories.researchCategories.get(tab).research.get(research).setSiblings(newReqs.toArray(new String[prereqs.length - 1])); - break; - } - } - } + for (ResearchCategoryList category : ResearchCategories.researchCategories.values()) { + for (Entry entry : category.research.entrySet()) { + String research = entry.getKey(); + ResearchItem researchItem = entry.getValue(); + remove(research, researchItem.parents, children, researchItem::setParents); + remove(research, researchItem.parentsHidden, secretChildren, researchItem::setParentsHidden); + remove(research, researchItem.siblings, siblings, researchItem::setSiblings); } } } @@ -78,39 +70,9 @@ public class OrphanResearch implements IUndoableAction { @Override public void undo() { - if (children.size() > 0) { - for (String research : children.keySet()) { - String[] oldPrereqs = ResearchCategories.researchCategories.get(children.get(research)).research.get(research).parents; - String[] newReqs = new String[oldPrereqs.length + 1]; - for (int x = 0; x < oldPrereqs.length; x++) { - newReqs[x] = oldPrereqs[x]; - } - newReqs[oldPrereqs.length] = key; - ResearchCategories.researchCategories.get(children.get(research)).research.get(research).setParents(newReqs); - } - } - if (secretChildren.size() > 0) { - for (String research : secretChildren.keySet()) { - String[] oldPrereqs = ResearchCategories.researchCategories.get(secretChildren.get(research)).research.get(research).parentsHidden; - String[] newReqs = new String[oldPrereqs.length + 1]; - for (int x = 0; x < oldPrereqs.length; x++) { - newReqs[x] = oldPrereqs[x]; - } - newReqs[oldPrereqs.length] = key; - ResearchCategories.researchCategories.get(secretChildren.get(research)).research.get(research).setParentsHidden(newReqs); - } - } - if (siblings.size() > 0) { - for (String research : siblings.keySet()) { - String[] oldPrereqs = ResearchCategories.researchCategories.get(siblings.get(research)).research.get(research).siblings; - String[] newReqs = new String[oldPrereqs.length + 1]; - for (int x = 0; x < oldPrereqs.length; x++) { - newReqs[x] = oldPrereqs[x]; - } - newReqs[oldPrereqs.length] = key; - ResearchCategories.researchCategories.get(siblings.get(research)).research.get(research).setSiblings(newReqs); - } - } + add(children, r -> r.parents, ResearchItem::setParents); + add(secretChildren, r -> r.parentsHidden, ResearchItem::setParentsHidden); + add(siblings, r -> r.siblings, ResearchItem::setSiblings); } @Override diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java b/src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java index abc1ddf..5e38e84 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java @@ -1,19 +1,33 @@ package modtweaker2.mods.thaumcraft.research; -import java.lang.reflect.Field; - import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; +import java.lang.reflect.Field; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; + public class SetAspects implements IUndoableAction { String key; String tab; AspectList oldList; AspectList list; boolean applied = false; + final static Field tags; + + static { + Field tags1; + try { + tags1 = Class.forName("thaumcraft.api.research.ResearchItem").getField("tags"); + } catch (NoSuchFieldException | ClassNotFoundException e) { + e.printStackTrace(); + tags1 = null; + } + tags = tags1; + } public SetAspects(String res, AspectList asp) { key = res; @@ -48,8 +62,10 @@ public class SetAspects implements IUndoableAction { @Override public void undo() { try { - ResearchItem research = ResearchCategories.researchCategories.get(tab).research.get(key); - Field tags = Class.forName("thaumcraft.api.research.ResearchItem").getField("tags"); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null || tags == null) { + return; + } tags.setAccessible(true); tags.set(research, oldList); } catch (Exception e) { diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java index 13cdd3c..8fe0386 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java @@ -1,13 +1,15 @@ package modtweaker2.mods.thaumcraft.research; -import java.lang.reflect.Field; - import minetweaker.IUndoableAction; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.mods.thaumcraft.handlers.Research.SetType; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; +import java.lang.reflect.Field; + +import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; + public class SetResearch implements IUndoableAction { String key; String tab; @@ -68,7 +70,11 @@ public class SetResearch implements IUndoableAction { @Override public void undo() { - ResearchItem research = ResearchCategories.researchCategories.get(tab).research.get(key); + final ResearchItem research = getResearchSafe(tab, key); + if(research == null) { + return; + } + if (!flag) { if (type == SetType.AUTO) research.setAutoUnlock(); else if (type == SetType.ROUND) research.setRound();