From 38bb1f5b1fd00e6a7f45579b30b0771ba5fbb684 Mon Sep 17 00:00:00 2001
From: Reider745 <70357814+Reider745@users.noreply.github.com>
Date: Fri, 1 Dec 2023 08:03:51 +0300
Subject: [PATCH] fix: command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- исправлено получение имени блока в команде
- добавлено в команду отображение всех вариаций блоков
- удалено из команды mods состояние мода вкл/выкл
---
 .../com/reider745/commands/CustomBlocksCommands.java | 12 ++++++------
 .../java/com/reider745/commands/ModsListCommand.java |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/reider745/commands/CustomBlocksCommands.java b/src/main/java/com/reider745/commands/CustomBlocksCommands.java
index fd3cdab4..42c623c1 100644
--- a/src/main/java/com/reider745/commands/CustomBlocksCommands.java
+++ b/src/main/java/com/reider745/commands/CustomBlocksCommands.java
@@ -7,6 +7,8 @@ import com.reider745.block.CustomBlock;
 import com.reider745.item.CustomItem;
 import com.reider745.item.ItemMethod;
 
+import java.util.ArrayList;
+
 public class CustomBlocksCommands extends Command {
     public CustomBlocksCommands() {
         super("custom_blocks", "get list custom blocks");
@@ -16,12 +18,10 @@ public class CustomBlocksCommands extends Command {
     public boolean execute(CommandSender commandSender, String s, String[] strings) {
         if(!commandSender.isOp()) return false;
 
-        String message = "===CustomBlocks===";
-        for(Integer id : CustomBlock.blocks.keySet()) {
-            CustomManager manager = CustomItem.getItemManager(id);
-            message += "\n"+manager.get(ItemMethod.PropertiesNames.NAME)+", id: "+id;
-        }
-        commandSender.sendMessage(message);
+        StringBuilder message = new StringBuilder("===CustomBlocks===");
+        for(Integer id : CustomBlock.blocks.keySet())
+            ((ArrayList<String>) CustomBlock.getBlockManager(id).get("variants")).forEach(name -> message.append("\n" + name + ", id: " + id));
+        commandSender.sendMessage(message.toString());
         return true;
     }
 }
diff --git a/src/main/java/com/reider745/commands/ModsListCommand.java b/src/main/java/com/reider745/commands/ModsListCommand.java
index 226ef75e..89c1fed4 100644
--- a/src/main/java/com/reider745/commands/ModsListCommand.java
+++ b/src/main/java/com/reider745/commands/ModsListCommand.java
@@ -24,7 +24,7 @@ public class ModsListCommand extends Command {
         for(ApparatusMod mod : mods){
             if(mod instanceof LegacyInnerCoreMod legacyMod){
                 Mod instance = legacyMod.getLegacyModInstance();
-                message += "\n"+instance.getName()+", version: "+instance.getVersion()+", enabled: "+legacyMod.isEnabledAndAbleToRun();
+                message += "\n"+instance.getName()+", version: "+instance.getVersion();
             }
         }
         commandSender.sendMessage(message);