From b92a1a10e96b216e8eb72cc0ee2a61a2065bc486 Mon Sep 17 00:00:00 2001
From: temp1011 <34900092+temp1011@users.noreply.github.com>
Date: Wed, 27 Jun 2018 02:06:38 +0100
Subject: [PATCH] add kill count to butterfly kill command (#2174)
---
.../lepidopterology/commands/CommandButterfly.java | 13 ++++++++-----
src/main/resources/assets/forestry/lang/en_us.lang | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java b/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java
index 2b23f1c834..725236c013 100644
--- a/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java
+++ b/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java
@@ -10,13 +10,15 @@
******************************************************************************/
package forestry.lepidopterology.commands;
-import forestry.core.commands.CommandHelpers;
-import forestry.core.commands.SubCommand;
-import forestry.lepidopterology.entities.EntityButterfly;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.EntitySelectors;
+import net.minecraft.util.text.TextComponentTranslation;
+
+import forestry.core.commands.CommandHelpers;
+import forestry.core.commands.SubCommand;
+import forestry.lepidopterology.entities.EntityButterfly;
/**
* @author CovertJaguar
@@ -42,12 +44,13 @@ public void executeSubCommand(MinecraftServer server, ICommandSender sender, Str
if (args.length > 1) {
CommandHelpers.throwWrongUsage(sender, this);
}
-
+ int killCount = 0;
for (EntityButterfly butterfly : sender.getEntityWorld().getEntities(EntityButterfly.class, EntitySelectors.IS_ALIVE)) {
butterfly.setDead();
+ killCount++;
}
+ sender.sendMessage(new TextComponentTranslation("for.chat.command.forestry.butterfly.kill.response", killCount));
}
-
}
}
diff --git a/src/main/resources/assets/forestry/lang/en_us.lang b/src/main/resources/assets/forestry/lang/en_us.lang
index ca733ab3b1..b6bf188d5d 100644
--- a/src/main/resources/assets/forestry/lang/en_us.lang
+++ b/src/main/resources/assets/forestry/lang/en_us.lang
@@ -1496,6 +1496,7 @@ for.chat.command.forestry.butterfly.format=Format: /%s
for.chat.command.forestry.butterfly.kill.desc=- %s : Kills all Butterflies
for.chat.command.forestry.butterfly.kill.help=Kills all Butterflies in loaded chunks
for.chat.command.forestry.butterfly.kill.format=Format: /%s []
+for.chat.command.forestry.butterfly.kill.response=Killed %d butterflies
for.butterflies.hybrid=Hybrid: %PRIMARY-%SECONDARY