Manual Rewrite (#5899)

* Move old manual files to manual_old before rewrite

* Start of manual changes.

 - First three categories are reorganized
 - All manual entries that did not correspond codeside are renamed to match ingame names
 - Manual is prepped to recieve more changes
 - First three category entries with minimal changes are respaced
     - Respacing means separating into easily-read paragraphs
     - Also means making things fit onto pages better on my monitor
     - I do not know how it will behave on other monitors
 - Overall manual should hopefuly be more intelligible once this is done

* Update to <br> and not enters to generalize

* Fixes from Blu's discord comments

* Add in electrical grid changes

* Fix lacking <br>s and gradle.properties change

* Finish up basic changes to existing explosives & weaponry entries.

* Tools entries done

* Furnaces & Ovens entries done

* Add in large machines

* Rename/reenable some entries

* Simple Machinery basic entries done

* Update Construction with new entries

* Update Electrical Grids

* Fix up Workbenches & Storage with moved entries

* Add missing files

* Create Storage & Transport category

* Finish up reorganization of categories

* Update hemp entries

* Update Construction to hopefully-final pages

* Add secondary forgotten things

* Work in non-resource pages

* Update missing links

* Update resources tab to be complete

* Rebuild datagen cache

* Update taglines courtesy of @BluSunrize

* First pass of changes asked by @BluSunrize

* Cleanup formatting of Hempcrete recipe

src/api/java/blusunrize/immersiveengineering/api/ManualHelper.java

@@ -27,13 +27,16 @@
  */
 public class ManualHelper
 {
-	public static String CAT_GENERAL = "general";
+	public static String CAT_RESOURCES = "resources";
+	public static String CAT_WORKBENCHES_STORAGE = "workbenches_storage";
 	public static String CAT_CONSTRUCTION = "construction";
-	public static String CAT_ENERGY = "energy";
-	public static String CAT_MACHINES = "machines";
+	public static String CAT_ELECTRICAL_GRIDS = "electrical_grids";
+	public static String CAT_EXPLOSIVES_WEAPONRY = "explosives_weaponry";
 	public static String CAT_TOOLS = "tools";
-	public static String CAT_HEAVYMACHINES = "heavymachines";
-	public static String CAT_UPDATE = "update";
+	public static String CAT_SIMPLE_MACHINERY = "simple_machinery";
+	public static String CAT_LARGE_FURNACES_OVENS = "large_furnaces_ovens";
+	public static String CAT_HEAVY_MACHINERY = "heavy_machinery";
+	public static String CAT_UPDATE = "updates";
 
 	/**
 	 * A map of keys (manual anchors) to suppliers that generate a table.

src/main/java/blusunrize/immersiveengineering/client/IEManual.java

@@ -124,17 +124,17 @@ public static void initManual()
 	public static void addIEManualEntries()
 	{
 		IEManualInstance ieMan = (IEManualInstance)ManualHelper.getManual();
-		InnerNode<ResourceLocation, ManualEntry> generalCat = ieMan.getRoot().getOrCreateSubnode(new ResourceLocation(MODID,
-				ManualHelper.CAT_GENERAL), 0);
+		InnerNode<ResourceLocation, ManualEntry> resourcesCat = ieMan.getRoot().getOrCreateSubnode(new ResourceLocation(MODID,
+				ManualHelper.CAT_RESOURCES), 0);
+		InnerNode<ResourceLocation, ManualEntry> toolsCat = ieMan.getRoot().getOrCreateSubnode(new ResourceLocation(MODID,
+			ManualHelper.CAT_TOOLS), 50);
 
 		{
 			ManualEntry.ManualEntryBuilder builder = new ManualEntry.ManualEntryBuilder(ManualHelper.getManual());
-			builder.readFromFile(new ResourceLocation(MODID, "minerals"));
+			builder.readFromFile(new ResourceLocation(MODID, "mineral_deposits"));
 			builder.appendText(IEManual::getMineralVeinTexts);
-			ieMan.addEntry(generalCat, builder.create(), ieMan.atOffsetFrom(generalCat, "graphite", -0.5));
+			ieMan.addEntry(resourcesCat, builder.create(), ieMan.atOffsetFrom(resourcesCat, "ores", 0.5));
 		}
-		// hide entry on blueprints
-		ieMan.hideEntry(new ResourceLocation(MODID, "blueprints"));
 		{
 			ManualEntry.ManualEntryBuilder builder = new ManualEntryBuilder(ieMan);
 			builder.setContent(
@@ -160,7 +160,7 @@ public static void addIEManualEntries()
 			}
 			builder.setLocation(new ResourceLocation(MODID, "shader_list"));
 			ManualEntry e = builder.create();
-			ieMan.addEntry(generalCat, e);
+			ieMan.addEntry(toolsCat, e);
 			ieMan.hideEntry(e.getLocation());
 		}
 

src/main/resources/assets/immersiveengineering/lang/en_us.json

@@ -731,15 +731,18 @@
   "effect.immersiveengineering.concrete_feet": "Concrete Feet",
   "effect.immersiveengineering.flashed": "Flashed",
   "manual.immersiveengineering.manual": "Engineer's Manual",
-  "manual.immersiveengineering.update": "UPDATE NEWS!",
-  "manual.immersiveengineering.general": "Overview and Resources",
-  "manual.immersiveengineering.early_machines": "Workbenches & Furnaces",
+  "manual.immersiveengineering.updates": "!!Update News!!",
+  "manual.immersiveengineering.introduction": "Introduction",
+  "manual.immersiveengineering.other_engineers": "Other Engineers",
+  "manual.immersiveengineering.resources": "Resources",
+  "manual.immersiveengineering.storage_transport": "Storage & Transport",
   "manual.immersiveengineering.construction": "Construction",
-  "manual.immersiveengineering.energy": "Power, wires, generators",
-  "manual.immersiveengineering.test": "A subcategory!?",
+  "manual.immersiveengineering.electrical_grids": "Electrical Grids",
+  "manual.immersiveengineering.explosives_weaponry": "Explosives & Weaponry",
   "manual.immersiveengineering.tools": "Tools",
-  "manual.immersiveengineering.machines": "Simple Machines",
-  "manual.immersiveengineering.heavymachines": "Heavy Machinery",
+  "manual.immersiveengineering.workbenches_machinery": "Workbenches & Machinery",
+  "manual.immersiveengineering.multiblock_constructions": "Multiblock Constructions",
+  "manual.immersiveengineering.heavy_machinery": "Heavy Machinery",
   "desc.immersiveengineering.info.shader.details.rosequartz": "First shader ever made!<br>No direct reference, though the name itself was inspired by a character in the „Inkheart“ series of novels",
   "desc.immersiveengineering.info.shader.details.argo": "No direct reference, but style+colour were inspired by the videogame 'Destiny'.",
   "desc.immersiveengineering.info.shader.details.sunstrike": "No direct reference but name+colour were inspired by Sunbreaker Titans from the videogame 'Destiny'.",
@@ -905,7 +908,7 @@
   "block.immersiveengineering.craftingtable": "Engineer's Crafting Table",
   "block.immersiveengineering.crate": "Wooden Storage Crate",
   "block.immersiveengineering.workbench": "Engineer's Workbench",
-  "block.immersiveengineering.circuit_table": "Engineer's Circuit Table",
+  "block.immersiveengineering.circuit_table": "Engineer's Circuit Workbench",
   "block.immersiveengineering.sorter": "Item Router",
   "block.immersiveengineering.item_batcher": "Item Batcher",
   "block.immersiveengineering.logic_unit": "Logic Unit",

src/main/resources/assets/immersiveengineering/manual/powerpack.json → src/main/resources/assets/immersiveengineering/manual/accumulator_backpack.json

@@ -1,5 +1,5 @@
 {
-  "start": {
+  "frame_recipe": {
     "type": "crafting",
     "recipe": "crafting/powerpack"
   },