diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/thaumcraft')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java | 5 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java index f44ba823db..19777cc7c9 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java @@ -73,10 +73,7 @@ public class CommandDumpAspects implements ICommand { @Override public boolean canCommandSenderUseCommand(final ICommandSender var1) { final EntityPlayer P = CommandUtils.getPlayer(var1); - if (P == null || !PlayerUtils.isPlayerOP(P)) { - return false; - } - return true; + return P != null && PlayerUtils.isPlayerOP(P); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java index 8fb8e2fc7d..d363b2cba9 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java @@ -23,7 +23,7 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; public class ThreadAspectScanner extends Thread { public static boolean mDoWeScan = false; - private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<String, AutoMap<ItemStack>>(); + private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<>(); public final File mAspectCacheFile; public ThreadAspectScanner() { @@ -49,7 +49,7 @@ public class ThreadAspectScanner extends Thread { } } } - AutoMap<ItemStack> m = new AutoMap<ItemStack>(); + AutoMap<ItemStack> m = new AutoMap<>(); if (mAllGameContent.containsKey(nameKey)) { m = mAllGameContent.get(nameKey); } @@ -123,14 +123,14 @@ public class ThreadAspectScanner extends Thread { if (a == null) { continue; } else { - AutoMap<Pair<String, Integer>> aspectPairs = new AutoMap<Pair<String, Integer>>(); + AutoMap<Pair<String, Integer>> aspectPairs = new AutoMap<>(); for (thaumcraft.api.aspects.Aspect c : a.getAspectsSortedAmount()) { if (c != null) { - aspectPairs.put(new Pair<String, Integer>(c.getName(), a.getAmount(c))); + aspectPairs.put(new Pair<>(c.getName(), a.getAmount(c))); } } try { - List<String> mList = new ArrayList<String>(); + List<String> mList = new ArrayList<>(); mList.add( stack.getDisplayName() + " | Meta: " + stack.getItemDamage() @@ -156,6 +156,5 @@ public class ThreadAspectScanner extends Thread { "Completed Aspect Iteration. AspectInfo.txt is now available to process in the GTplusplus configuration folder."); CommandDumpAspects.mLastScanTime = System.currentTimeMillis(); } - return; } } |