diff --git a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java index 396ed7229..5352e23c5 100644 --- a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java @@ -51,7 +51,7 @@ public class BeeModeHelper implements ICommandModeHelper { } @Override - public ArrayList getDescription(String modeName) { + public Iterable getDescription(String modeName) { IBeekeepingMode mode = PluginApiculture.beeInterface.getBeekeepingMode(modeName); return mode.getDescription(); } diff --git a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java index 6e69bd27f..ed2e020b2 100644 --- a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java @@ -51,11 +51,6 @@ public class BeeStatsSaveHelper implements IStatsSaveHelper { statistics.add(""); } - @Override - public String getModeName(World world) { - return PluginApiculture.beeInterface.getBeekeepingMode(world).getName(); - } - @Override public Collection getSpecies() { Collection species = new ArrayList(); diff --git a/src/main/java/forestry/apiculture/commands/CommandBee.java b/src/main/java/forestry/apiculture/commands/CommandBee.java index baf36df83..9cf050973 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBee.java +++ b/src/main/java/forestry/apiculture/commands/CommandBee.java @@ -26,7 +26,7 @@ public class CommandBee extends SubCommand { ICommandModeHelper modeHelper = new BeeModeHelper(); addChildCommand(new CommandMode(modeHelper)); - addChildCommand(new CommandSaveStats(saveHelper)); + addChildCommand(new CommandSaveStats(saveHelper, modeHelper)); addChildCommand(new CommandBeeGive()); } } diff --git a/src/main/java/forestry/arboriculture/commands/CommandTree.java b/src/main/java/forestry/arboriculture/commands/CommandTree.java index 88c86d8b3..f15d86448 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTree.java +++ b/src/main/java/forestry/arboriculture/commands/CommandTree.java @@ -27,7 +27,7 @@ public class CommandTree extends SubCommand { addChildCommand(new CommandTreeSpawn("spawnTree", new TreeSpawner())); addChildCommand(new CommandTreeSpawn("spawnForest", new ForestSpawner())); addChildCommand(new CommandMode(modeHelper)); - addChildCommand(new CommandSaveStats(saveHelper)); + addChildCommand(new CommandSaveStats(saveHelper, modeHelper)); } } diff --git a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java index c0a13ee1f..61c4b5fc1 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java @@ -51,7 +51,7 @@ public class TreeModeHelper implements ICommandModeHelper { } @Override - public ArrayList getDescription(String modeName) { + public Iterable getDescription(String modeName) { ITreekeepingMode mode = PluginArboriculture.treeInterface.getTreekeepingMode(modeName); return mode.getDescription(); } diff --git a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java index 6a1b2e568..8eae52876 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java @@ -36,11 +36,6 @@ public class TreeStatsSaveHelper implements IStatsSaveHelper { public void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker) { } - @Override - public String getModeName(World world) { - return PluginArboriculture.treeInterface.getTreekeepingMode(world).getName(); - } - @Override public Collection getSpecies() { Collection species = new ArrayList(); diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index 18f3ea606..658d15086 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -37,17 +37,22 @@ import forestry.core.utils.StringUtil; public final class CommandSaveStats extends SubCommand { - private final String discoveredSymbol; - private final String blacklistedSymbol; - private final String notCountedSymbol; - private final IStatsSaveHelper saveHelper; - - public CommandSaveStats(IStatsSaveHelper saveHelper) { - super("save"); + private static final String discoveredSymbol; + private static final String blacklistedSymbol; + private static final String notCountedSymbol; + static { discoveredSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered.symbol"); blacklistedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted.symbol"); notCountedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted.symbol"); + } + + private final IStatsSaveHelper saveHelper; + private final ICommandModeHelper modeHelper; + + public CommandSaveStats(IStatsSaveHelper saveHelper, ICommandModeHelper modeHelper) { + super("save"); this.saveHelper = saveHelper; + this.modeHelper = modeHelper; } @Override @@ -76,7 +81,7 @@ public final class CommandSaveStats extends SubCommand { String date = DateFormat.getInstance().format(new Date()); statistics.add(StatCollector.translateToLocalFormatted(saveHelper.getUnlocalizedSaveStatsString(), player.getDisplayName(), date)); statistics.add(""); - statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", saveHelper.getModeName(world))); + statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", modeHelper.getModeName(world))); statistics.add(""); IBreedingTracker tracker = saveHelper.getBreedingTracker(world, player.getGameProfile()); diff --git a/src/main/java/forestry/core/commands/ICommandModeHelper.java b/src/main/java/forestry/core/commands/ICommandModeHelper.java index 3e57fa387..f5670c7d2 100644 --- a/src/main/java/forestry/core/commands/ICommandModeHelper.java +++ b/src/main/java/forestry/core/commands/ICommandModeHelper.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.commands; -import java.util.ArrayList; - import net.minecraft.world.World; public interface ICommandModeHelper { @@ -22,5 +20,5 @@ public interface ICommandModeHelper { String getModeName(World world); void setMode(World world, String modeName); - ArrayList getDescription(String modeName); + Iterable getDescription(String modeName); } diff --git a/src/main/java/forestry/core/commands/IStatsSaveHelper.java b/src/main/java/forestry/core/commands/IStatsSaveHelper.java index 3cc6092fc..51ab4d130 100644 --- a/src/main/java/forestry/core/commands/IStatsSaveHelper.java +++ b/src/main/java/forestry/core/commands/IStatsSaveHelper.java @@ -25,8 +25,6 @@ public interface IStatsSaveHelper { void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker); - String getModeName(World world); - Collection getSpecies(); String getFileSuffix();