Remove Unused Code

src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java

@@ -77,7 +77,7 @@ public void onPlayerTick(PlayerTickEvent event) {
                 .func_152602_a(player);
 
         if (statFile == null) {
-            MainRegistry.Logger.warn(
+            MainRegistry.LOGGER.warn(
                     "Failed to get statistics file for player {} (UUID: {}) during PlayerTickEvent.",
                     player.getCommandSenderName(),
                     uuid);
@@ -150,7 +150,7 @@ public void onLivingAttack(LivingAttackEvent event) {
                 .func_152602_a(player);
 
         if (statFile == null) {
-            MainRegistry.Logger.warn(
+            MainRegistry.LOGGER.warn(
                     "Failed to get statistics file for player {} (UUID: {}) during LivingAttackEvent.",
                     player.getCommandSenderName(),
                     uuid);

src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java

@@ -4,7 +4,6 @@
 import static com.dreammaster.scripts.IScriptLoader.wildcard;
 import static gregtech.api.enums.Mods.*;
 
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagInt;
 import net.minecraft.nbt.NBTTagString;
@@ -182,9 +181,7 @@ public void loadConfig() {
             creativeBank.setTagInfo("storedEnergyRF", new NBTTagInt(2500000));
         }
 
-        API.setOverrideName(new ItemStack(Blocks.ender_chest), "Personal Ender Chest");
-
-        MainRegistry.Logger.info("Added NEI Config");
+        MainRegistry.LOGGER.info("Added NEI Config");
     }
 
     @Override

src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java

@@ -27,8 +27,6 @@
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import com.dreammaster.main.MainRegistry;
-
 import bartworks.MainMod;
 import bartworks.common.items.SimpleSubItemClass;
 import bartworks.common.loaders.BioItemList;
@@ -48,29 +46,25 @@ public class BioItemLoader {
     private static Item BIOTEMS;
     private static Fluid[] BIOFLUIDS;
 
-    public static boolean preInit() {
-        try {
-            BIOTEMS = new SimpleSubItemClass("itemCollagen", "itemGelatin", "itemAgar").setCreativeTab(MainMod.BIO_TAB);
-            GameRegistry.registerItem(BIOTEMS, "GTNHBioItems", BartWorks.ID);
-
-            BIOFLUIDS = new Fluid[] {
-                    GTFluidFactory.builder("GelatinMixture").withLocalizedName("Gelatin Mixture")
-                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 255, 255, 125 })
-                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
-                    GTFluidFactory.builder("MeatExtract").withLocalizedName("Meat Extract")
-                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 160, 70, 50 })
-                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
-                    GTFluidFactory.builder("UnknownNutrientAgar").withLocalizedName("Unknown Nutrient Agar")
-                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 175, 133, 0 })
-                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
-                    GTFluidFactory.builder("SeaweedBroth").withLocalizedName("Seaweed Broth")
-                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 60, 200, 0 })
-                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid() };
-            return true;
-        } catch (Exception e) {
-            MainRegistry.Logger.error(e);
-            return false;
-        }
+    // FIXME: Move bio-items to Bartworks and remove this whole section.
+    public static void preInit() {
+        BIOTEMS = new SimpleSubItemClass("itemCollagen", "itemGelatin", "itemAgar").setCreativeTab(MainMod.BIO_TAB);
+        GameRegistry.registerItem(BIOTEMS, "GTNHBioItems", BartWorks.ID);
+
+        BIOFLUIDS = new Fluid[] {
+                GTFluidFactory.builder("GelatinMixture").withLocalizedName("Gelatin Mixture")
+                        .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 255, 255, 125 })
+                        .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
+                GTFluidFactory.builder("MeatExtract").withLocalizedName("Meat Extract")
+                        .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 160, 70, 50 })
+                        .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
+                GTFluidFactory.builder("UnknownNutrientAgar").withLocalizedName("Unknown Nutrient Agar")
+                        .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 175, 133, 0 })
+                        .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
+                GTFluidFactory.builder("SeaweedBroth").withLocalizedName("Seaweed Broth")
+                        .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 60, 200, 0 })
+                        .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid() };
+
     }
 
     public static void registerRecipes() {

src/main/java/com/dreammaster/client/util/GTNHPauseScreen.java

@@ -98,7 +98,7 @@ public void onActionPerformed(GuiScreenEvent.ActionPerformedEvent.Post event) {
             final URI uri = new URI(address);
             FilesUtil.openUri(uri);
         } catch (Throwable throwable) {
-            MainRegistry.Logger.error("Couldn't open link", throwable);
+            MainRegistry.LOGGER.error("Couldn't open link", throwable);
         }
     }
 

src/main/java/com/dreammaster/command/CustomDropsCommand.java

@@ -1,18 +1,17 @@
 package com.dreammaster.command;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.command.PlayerNotFoundException;
+import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentTranslation;
 
 import com.dreammaster.main.MainRegistry;
 
-import eu.usrv.yamcore.auxiliary.PlayerChatHelper;
-
 public class CustomDropsCommand extends CommandBase {
 
     @Override
@@ -21,73 +20,52 @@ public String getCommandName() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "/customdrops reload|toggleinfo";
+    public String getCommandUsage(ICommandSender sender) {
+        return "dreamcraft.command.customdrops.usage";
     }
 
     @Override
     public List<String> getCommandAliases() {
-        List<String> aliases = new ArrayList<>();
-        aliases.add("cdrops");
-        aliases.add("cdr");
-        return aliases;
+        return Arrays.asList("cdrops", "cdr");
     }
 
     @Override
-    public void processCommand(ICommandSender pCmdSender, String[] pArgs) {
-        if (pArgs.length == 0) {
-            if (inGame(pCmdSender)) {
-                PlayerChatHelper.SendError(pCmdSender, "Syntax error. Type /customdrops help for help");
-            } else {
-                PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Syntax error. Type /customdrops help for help");
-            }
-        } else if ("help".equalsIgnoreCase(pArgs[0])) {
-            sendHelpToPlayer(pCmdSender);
-        } else if ("toggleinfo".equalsIgnoreCase(pArgs[0])) {
-            if (!inGame(pCmdSender)) {
-                PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] This command can only be executed in game");
+    public int getRequiredPermissionLevel() {
+        return 2;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length == 0) {
+            throw new WrongUsageException(getCommandUsage(sender));
+        } else if ("toggleinfo".equalsIgnoreCase(args[0])) {
+            EntityPlayer targetPlayer;
+
+            if (args.length == 2) {
+                targetPlayer = getPlayer(sender, args[1]);
+            } else if (sender instanceof EntityPlayer entityPlayer) {
+                targetPlayer = entityPlayer;
             } else {
-                EntityPlayer tEP = (EntityPlayer) pCmdSender;
-                MainRegistry.Module_CustomDrops.toggleDeathInfoForPlayer(tEP);
+                throw new PlayerNotFoundException();
             }
-        } else if ("reload".equalsIgnoreCase(pArgs[0])) {
-            boolean tFlag = MainRegistry.Module_CustomDrops.ReloadCustomDrops();
-            if (!tFlag) {
-                if (!inGame(pCmdSender)) {
-                    PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Reload failed. Check your log for syntax errors");
-                } else {
-                    PlayerChatHelper.SendWarn(pCmdSender, "Reload failed. Check your log for syntax errors");
-                }
+
+            MainRegistry.Module_CustomDrops.toggleDeathInfoForPlayer(targetPlayer);
+        } else if ("reload".equalsIgnoreCase(args[0])) {
+            if (MainRegistry.Module_CustomDrops.ReloadCustomDrops()) {
+                sender.addChatMessage(new ChatComponentTranslation("dreamcraft.command.reload.success"));
             } else {
-                if (!inGame(pCmdSender)) {
-                    PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Reload done. New config is activated");
-                } else {
-                    PlayerChatHelper.SendInfo(pCmdSender, "Reload done. New config is activated");
-                }
+                sender.addChatMessage(new ChatComponentTranslation("dreamcraft.command.reload.failure"));
             }
         } else {
-            sendHelpToPlayer(pCmdSender);
-        }
-    }
-
-    private boolean inGame(ICommandSender pCmdSender) {
-        return pCmdSender instanceof EntityPlayer;
-    }
-
-    private void sendHelpToPlayer(ICommandSender pCmdSender) {
-        if (!inGame(pCmdSender)) {
-            PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Valid options are: reload");
-        } else {
-            PlayerChatHelper.SendInfo(pCmdSender, "/customdrops reload|toggleinfo");
+            throw new WrongUsageException(getCommandUsage(sender));
         }
     }
 
     @Override
-    public boolean canCommandSenderUseCommand(ICommandSender pCommandSender) {
-        if (pCommandSender instanceof EntityPlayerMP tEP) {
-            return MinecraftServer.getServer().getConfigurationManager().func_152596_g(tEP.getGameProfile());
-        } else {
-            return pCommandSender instanceof MinecraftServer;
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return getListOfStringsMatchingLastWord(args, "toggleinfo", "reload");
         }
+        return null;
     }
 }