ecaa90a438
Partially overhauled our command classes. Added DDCommandBase - it extends CommandBase and acts as a new base class for our commands. It removes a little redundancy in our code and provides increased convenience. Removed the static fields for our commands in mod_pocketDim. There was no point in keeping them when nothing was using them. Changed in-game command names to be shorter yet relevant. Converted all commands to singletons so proper instances can be retrieved if necessary. Migrated some of the custom dungeon start/ending logic to DungeonHelper and made customDungeonStatus private. Except for data objects, we shouldn't be exposing state variables like that without any kind of checks. I've rewritten the code in some commands but it's been quite tiring. Still need to fix up lots of things.
63 lines
No EOL
1.5 KiB
Java
63 lines
No EOL
1.5 KiB
Java
package StevenDimDoors.mod_pocketDim.commands;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
|
|
import net.minecraft.entity.player.EntityPlayer;
|
|
import StevenDimDoors.mod_pocketDim.DimData;
|
|
import StevenDimDoors.mod_pocketDim.LinkData;
|
|
import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
|
|
|
|
public class CommandPruneDimensions extends DDCommandBase
|
|
{
|
|
private static CommandPruneDimensions instance = null;
|
|
|
|
private CommandPruneDimensions()
|
|
{
|
|
super("dd-prune");
|
|
}
|
|
|
|
public static CommandPruneDimensions instance()
|
|
{
|
|
if (instance == null)
|
|
instance = new CommandPruneDimensions();
|
|
|
|
return instance;
|
|
}
|
|
|
|
@Override
|
|
protected void processCommand(EntityPlayer sender, String[] command)
|
|
{
|
|
int numRemoved=0;
|
|
ArrayList<Integer> dimsWithLinks = new ArrayList<Integer>();
|
|
Collection<DimData> allDims = new ArrayList<DimData>();
|
|
allDims.addAll(dimHelper.dimList.values());
|
|
for(DimData data: allDims)
|
|
{
|
|
for(LinkData link:data.printAllLinkData())
|
|
{
|
|
if(!dimsWithLinks.contains(link.destDimID))
|
|
{
|
|
dimsWithLinks.add(link.destDimID);
|
|
}
|
|
}
|
|
}
|
|
for(LinkData link : dimHelper.instance.interDimLinkList.values())
|
|
{
|
|
if(!dimsWithLinks.contains(link.destDimID))
|
|
{
|
|
dimsWithLinks.add(link.destDimID);
|
|
}
|
|
}
|
|
for(DimData data : allDims)
|
|
{
|
|
if(!dimsWithLinks.contains(data.dimID))
|
|
{
|
|
dimHelper.dimList.remove(data.dimID);
|
|
numRemoved++;
|
|
}
|
|
}
|
|
dimHelper.instance.save();
|
|
sender.sendChatToPlayer("Removed " + numRemoved + " unreachable pocket dims.");
|
|
}
|
|
} |