From cefcd7dee5a7b84752435210a29e35daf5fefc24 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 16 Jul 2026 09:21:33 +0200 Subject: [PATCH] YOUR TAKING TOO LONG --- .../com/hbm/commands/CommandWikiRender.java | 84 +++++++++---------- src/main/java/com/hbm/main/MainRegistry.java | 1 + 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/hbm/commands/CommandWikiRender.java b/src/main/java/com/hbm/commands/CommandWikiRender.java index 4a816b318..67453b235 100644 --- a/src/main/java/com/hbm/commands/CommandWikiRender.java +++ b/src/main/java/com/hbm/commands/CommandWikiRender.java @@ -13,14 +13,15 @@ import com.hbm.items.machine.ItemRBMKPellet; import com.hbm.main.MainRegistry; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.command.WrongUsageException; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.command.ICommandSender; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.client.ClientCommandHandler; import net.minecraft.client.Minecraft; import net.minecraft.command.CommandBase; import net.minecraft.item.Item; @@ -28,63 +29,62 @@ import net.minecraft.init.Items; import net.minecraft.init.Blocks; // horribly written command so you can render more than fucking guns without having to decompile the JAR -@SideOnly(Side.CLIENT) // make it clientside so bobcat would not come after me public class CommandWikiRender extends CommandBase { + + public static void register() { + if(FMLLaunchHandler.side() != Side.CLIENT) return; + ClientCommandHandler.instance.registerCommand(new CommandWikiRender()); + } + @Override - public String getCommandName() { - return "ntmwikirender"; - } - - @Override - public String getCommandUsage(ICommandSender sender) { - return String.format(Locale.US, - "%s/%s %s- Render screenshots of a selected item type (e.g ItemGunBaseNT). Intended for developers and wiki editors only.", - EnumChatFormatting.GREEN, getCommandName(), EnumChatFormatting.LIGHT_PURPLE - ); - } + public String getCommandName() { + return "ntmwikirender"; + } - @Override - public void processCommand(ICommandSender sender, String[] args) { - if(!(sender instanceof EntityPlayer)) { - throw new PlayerNotFoundException(); - } - - if(args.length == 0) { + @Override + public String getCommandUsage(ICommandSender sender) { + return String.format(Locale.US, "%s/%s %s- Render screenshots of a selected item type (e.g ItemGunBaseNT). Intended for developers and wiki editors only.", EnumChatFormatting.GREEN, + getCommandName(), EnumChatFormatting.LIGHT_PURPLE); + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if(!(sender instanceof EntityPlayer)) { + throw new PlayerNotFoundException(); + } + + if(args.length == 0) { throw new WrongUsageException(getCommandUsage(sender), new Object[0]); - } + } - MainRegistry.logger.info("Taking a screenshot of " + args[0]); - - List ignoredItems = Arrays.asList( - ModItems.achievement_icon, - Items.spawn_egg, - Item.getItemFromBlock(Blocks.mob_spawner) - ); + MainRegistry.logger.info("Taking a screenshot of " + args[0]); - List> collapsedClasses = Arrays.asList( - ItemRBMKPellet.class, - ItemDepletedFuel.class, - ItemFluidDuct.class - ); + List ignoredItems = Arrays.asList(ModItems.achievement_icon, Items.spawn_egg, Item.getItemFromBlock(Blocks.mob_spawner)); - String prefix = args[0]; + List> collapsedClasses = Arrays.asList(ItemRBMKPellet.class, ItemDepletedFuel.class, ItemFluidDuct.class); + + String prefix = args[0]; int slotScale = 16; boolean ignoreNonNTM = true; List stacks = new ArrayList(); - for (Object reg : Item.itemRegistry) { + for(Object reg : Item.itemRegistry) { Item item = (Item) reg; - if(ignoreNonNTM && !Item.itemRegistry.getNameForObject(item).startsWith("hbm:")) continue; - if(ignoredItems.contains(item)) continue; - if(!item.getClass().getSimpleName().equalsIgnoreCase(args[0]) && (net.minecraft.block.Block.getBlockFromItem(item) == null || !net.minecraft.block.Block.getBlockFromItem(item).getClass().getSimpleName().equalsIgnoreCase(args[0]))) continue; + if(ignoreNonNTM && !Item.itemRegistry.getNameForObject(item).startsWith("hbm:")) + continue; + if(ignoredItems.contains(item)) + continue; + if(!item.getClass().getSimpleName().equalsIgnoreCase(args[0]) + && (net.minecraft.block.Block.getBlockFromItem(item) == null || !net.minecraft.block.Block.getBlockFromItem(item).getClass().getSimpleName().equalsIgnoreCase(args[0]))) + continue; if(collapsedClasses.contains(item.getClass())) { stacks.add(new ItemStack(item)); } else { item.getSubItems(item, null, stacks); - } } - - Minecraft.getMinecraft().thePlayer.closeScreen(); - FMLCommonHandler.instance().showGuiScreen(new GUIScreenWikiRender(stacks.toArray(new ItemStack[0]), prefix, "wiki-block-renders-256", slotScale)); } + + Minecraft.getMinecraft().thePlayer.closeScreen(); + FMLCommonHandler.instance().showGuiScreen(new GUIScreenWikiRender(stacks.toArray(new ItemStack[0]), prefix, "wiki-block-renders-256", slotScale)); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index fa8c04d04..9ffb9ebc0 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -606,6 +606,7 @@ public class MainRegistry { Compat.handleRailcraftNonsense(); SuicideThreadDump.register(); CommandReloadClient.register(); + CommandWikiRender.register(); //ExplosionTests.runTest(); }