diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/commands')
3 files changed, 7 insertions, 151 deletions
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java deleted file mode 100644 index 8bd51e1459..0000000000 --- a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java +++ /dev/null @@ -1,141 +0,0 @@ -package gtPlusPlus.core.commands; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.preloader.ChunkDebugger; -import gtPlusPlus.preloader.asm.AsmConfig; - -public class CommandDebugChunks implements ICommand { - - private final List<String> aliases; - - protected String fullEntityName; - protected Entity conjuredEntity; - - public CommandDebugChunks() { - this.aliases = new ArrayList<>(); - aliases.add("debugchunks"); - aliases.add("DC"); - } - - @Override - public int compareTo(final Object o) { - return 0; - } - - @Override - public String getCommandName() { - return "DebugChunks"; - } - - @Override - public String getCommandUsage(final ICommandSender var1) { - return "/DebugChunks"; - } - - @Override - public List<String> getCommandAliases() { - return this.aliases; - } - - @Override - public void processCommand(final ICommandSender S, final String[] argString) { - Logger.INFO("Debug Command"); - - final World W = S.getEntityWorld(); - final EntityPlayer P = CommandUtils.getPlayer(S); - - if (!AsmConfig.enableChunkDebugging) { - PlayerUtils.messagePlayer(P, "Chunk Debugging is disabled."); - return; - } - - Map<String, Integer> aTicketCounter = new LinkedHashMap<String, Integer>(); - for (Pair<String, String> f : ChunkDebugger.mChunkTicketsMap.values()) { - String aMod = f.getKey(); - String aDim = f.getValue(); - if (aMod != null) { - if (aTicketCounter.containsKey(aMod)) { - int aModTicketCount = aTicketCounter.get(aMod); - aModTicketCount++; - aTicketCounter.put(aMod, aModTicketCount); - } else { - aTicketCounter.put(aMod, 1); - } - } - } - if (aTicketCounter.isEmpty()) { - PlayerUtils.messagePlayer(P, "No forced chunk tickets active."); - } - for (String x : aTicketCounter.keySet()) { - PlayerUtils.messagePlayer(P, x + " has " + aTicketCounter.get(x) + " tickets active."); - } - - Map<String, Integer> aChunkCounter = new LinkedHashMap<String, Integer>(); - for (Pair<String, String> f : ChunkDebugger.mChunksLoadedByModsMap.values()) { - String aMod = f.getKey(); - String aDim = f.getValue(); - if (aMod == null) { - aMod = "Bad ModId"; - } - - if (aMod != null) { - // PlayerUtils.messagePlayer(P, aMod+" has "+aDim+" active."); - if (aChunkCounter.containsKey(aMod)) { - int aModTicketCount = aChunkCounter.get(aMod); - aModTicketCount = aModTicketCount + 1; - aChunkCounter.put(aMod, aModTicketCount); - Logger.INFO("Counting +1 for " + aMod + ", total of " + aModTicketCount); - } else { - aChunkCounter.put(aMod, 1); - Logger.INFO("Counting +1 for " + aMod); - } - } - } - if (aChunkCounter.isEmpty()) { - PlayerUtils.messagePlayer(P, "No chunks force loaded."); - } - for (String x : aChunkCounter.keySet()) { - PlayerUtils.messagePlayer(P, x + " has " + aChunkCounter.get(x) + " chunks active."); - } - } - - @Override - public boolean canCommandSenderUseCommand(final ICommandSender var1) { - final EntityPlayer P = CommandUtils.getPlayer(var1); - if (P == null) { - return false; - } - if (PlayerUtils.isPlayerOP(P)) { - return true; - } - return false; - } - - @Override - public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - return new ArrayList<>(); - } - - @Override - public boolean isUsernameIndex(final String[] var1, final int var2) { - // TODO Auto-generated method stub - return false; - } - - public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 76b27ce93e..ad57019bce 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -18,7 +18,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -75,7 +74,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { || argString[0].toLowerCase().equals("?")) { Logger.INFO("Listing commands and their uses."); final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:"); PlayerUtils.messagePlayer(P, "? - This help command."); PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session."); @@ -88,13 +87,13 @@ public class CommandEnableDebugWhileRunning implements ICommand { Logger.INFO("Toggling Debug Mode."); final EntityPlayer P = CommandUtils.getPlayer(S); if (PlayerUtils.isPlayerOP(P)) { - CORE_Preloader.DEBUG_MODE = Utils.invertBoolean(CORE_Preloader.DEBUG_MODE); + CORE_Preloader.DEBUG_MODE = !CORE_Preloader.DEBUG_MODE; PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + CORE_Preloader.DEBUG_MODE); } } else if (argString[0].toLowerCase().equals("logging")) { Logger.INFO("Toggling Logging."); final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging)); } /* @@ -130,7 +129,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { String aItemDisplayName = ItemUtils.getItemName(aHeldItem); String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem); String aNbtString = tryIterateNBTData(aHeldItem); - AutoMap<String> aOreDictNames = new AutoMap<String>(); + AutoMap<String> aOreDictNames = new AutoMap<>(); int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem); for (int id : aOreIDs) { @@ -151,7 +150,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { } } - AutoMap<String> aFluidContainerData = new AutoMap<String>(); + AutoMap<String> aFluidContainerData = new AutoMap<>(); FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); if (aHeldItemFluid != null) { aFluidContainerData.put("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName()); @@ -214,7 +213,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { @Override public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - ArrayList<String> aTabCompletes = new ArrayList<String>(); + ArrayList<String> aTabCompletes = new ArrayList<>(); aTabCompletes.add("?"); aTabCompletes.add("logging"); aTabCompletes.add("debug"); @@ -235,7 +234,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { public static String tryIterateNBTData(ItemStack aStack) { try { - AutoMap<String> aItemDataTags = new AutoMap<String>(); + AutoMap<String> aItemDataTags = new AutoMap<>(); NBTTagCompound aNBT = NBTUtils.getNBT(aStack); if (aNBT != null) { if (!aNBT.hasNoTags()) { diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java index 8659c00246..eb872160cc 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java @@ -22,8 +22,6 @@ public class CommandMath implements ICommand { public CommandMath() { this.aliases = new ArrayList<>(); - // this.aliases.add("hometele"); - // this.aliases.add("warphome"); } @Override |