Reduce the 1.7 tab to a single 1.7 Animations mod

common/src/main/resources/assets/dolphinclient/lang/en_us.json

@@ -268,7 +268,6 @@
 	"menu.client.search": "Search...",
 	"menu.client.tab.hud": "HUD",
 	"menu.client.tab.mods": "Mods",
-	"menu.client.tab.animations": "1.7",
 	"menu.client.tab.settings": "Settings",
 	"menu.client.edit": "Edit",
 	"menu.client.expand": ">",

versions/1.8.9/src/main/java/io/github/axolotlclient/config/ui/MenuCatalog.java

@@ -48,7 +48,6 @@ public final class MenuCatalog {
 	public enum Tab {
 		HUD,
 		MODS,
-		ANIMATIONS,
 		SETTINGS
 	}
 
@@ -150,7 +149,8 @@ public static List<Module> build() {
 				continue;
 			}
 			if (OldAnimations.MODID.equals(name)) {
-				absorbAnimations(modules, category);
+				/* the 1.7 features are one toggleable mod tile with its groups as inline sections */
+				modules.add(moduleFrom(name, Tab.MODS, firstEnabled(category.getOptions()), nodesFrom(category, false)));
 				continue;
 			}
 			Tab tab = isSettings(name) ? Tab.SETTINGS : isHudTab(name) ? Tab.HUD : Tab.MODS;
@@ -161,16 +161,6 @@ public static List<Module> build() {
 		return modules;
 	}
 
-	/**
-	 * The 1.7 tab lists the feature groups directly. The parent category and
-	 * Misc grab bag are gone, so only the remaining configurable groups appear.
-	 */
-	private static void absorbAnimations(List<Module> modules, OptionCategory category) {
-		for (OptionCategory child : category.getSubCategories()) {
-			modules.add(moduleFrom(child.getName(), Tab.ANIMATIONS, firstEnabled(child.getOptions()), nodesFrom(child, false)));
-		}
-	}
-
 	private static void absorb(List<Module> modules, OptionCategory category, Tab tab) {
 		Collection<OptionCategory> children = category.getSubCategories();
 		if (shouldPromote(children, tab)) {

versions/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java

@@ -92,7 +92,7 @@ public class HudEditScreen extends Screen {
 	private int listScroll;
 	private int mouseX, mouseY;
 	private int caretTicks;
-	private static final int TAB_COLS = 4;
+	private static final int TAB_COLS = 3;
 
 	private HudEntry current;
 	private DrawPosition offset;

versions/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/ModsMenuIcons.java

@@ -106,21 +106,7 @@ final class ModsMenuIcons {
 		put("bedwars", Items.BED);
 		put("titles", Items.SIGN);
 
-		put("blockingItemUsing", Items.IRON_SWORD);
-		put("sneaking", Items.IRON_BOOTS);
-		put("items", Items.DIAMOND);
-		put("spriteRendering", Items.PAINTING);
-		put("itemPositions", Items.STICK);
-		put("resources", Items.BOOK);
-		put("models", Items.ARMOR_STAND);
-		put("textures", Item.byBlock(Blocks.WOOL));
-		put("sounds", Items.RECORD_13);
-		put("combat", Items.DIAMOND_SWORD);
-		put("gui", Items.SIGN);
-		put("debugOverlay", Items.COMPASS);
-		put("enchantmentGlint", Items.EXPERIENCE_BOTTLE);
-		put("hitbox", Items.SLIME_BALL);
-		put("offsets", Items.COMPASS);
+		put("axolotlclient-oldanimations", Items.IRON_SWORD);
 	}
 
 	private ModsMenuIcons() {