Move most warfare entries to folders

Moves most warfare entries into folders for cleaner organization. Final touches added to entries.

src/main/java/pl/pabilo8/immersiveintelligence/client/manual/categories/IIManualCategoryWarfare.java

@@ -90,8 +90,9 @@ public void addPages()
 		ManualHelper.addEntry("bullet_components", getCategory(),
 				bullet_components.toArray(new ManualPages[]{})
 		);
-
-		addEntry("magazines")
+
+		//Items in Infantry Weapons folder
+		addEntry("weaponry/magazines")
 				.addSource("magazine_all", getSourceForItems(
 						IIContent.itemBulletMagazine.getMagazine(Magazines.MACHINEGUN),
 						IIContent.itemBulletMagazine.getMagazine(Magazines.SUBMACHINEGUN),
@@ -102,16 +103,15 @@ public void addPages()
 						IIContent.itemBulletMagazine.getMagazine(Magazines.CPDS_DRUM)
 				))
 				.addSource("magazine_blueprint", getSourceForItem(BlueprintCraftingRecipe.getTypedBlueprint("bullet_magazines")));
-
-		addEntry("machinegun")
+		addEntry("weaponry/machinegun")
 				.addSource("machinegun", getSourceForItem(new ItemStack(IIContent.itemMachinegun)));
-		addEntry("rifle")
+		addEntry("weaponry/rifle")
 				.addSource("rifle", getSourceForItem(new ItemStack(IIContent.itemRifle)));
-		addEntry("assault_rifle")
+		addEntry("weaponry/assault_rifle")
 				.addSource("assaultrifle", getSourceForItem(new ItemStack(IIContent.itemAssaultRifle)));
-		addEntry("submachinegun")
+		addEntry("weaponry/submachinegun")
 				.addSource("submachinegun", getSourceForItem(new ItemStack(IIContent.itemSubmachinegun)));
-		addEntry("weapon_upgrades")
+		addEntry("weaponry/weapon_upgrades")
 				.addSource("heavy_barrel", getSourceForItem(IIContent.itemWeaponUpgrade.getStack(WeaponUpgrade.HEAVY_BARREL)))
 				.addSource("water_cooling", getSourceForItem(IIContent.itemWeaponUpgrade.getStack(WeaponUpgrade.WATER_COOLING)))
 				.addSource("belt_fed_loader", getSourceForItem(IIContent.itemWeaponUpgrade.getStack(WeaponUpgrade.BELT_FED_LOADER)))
@@ -133,8 +133,16 @@ public void addPages()
 				.addSource("railgun_assisted_chamber", getSourceForItem(IIContent.itemWeaponUpgrade.getStack(WeaponUpgrade.RAILGUN_ASSISTED_CHAMBER)))
 				.addSource("sami_automatic", getSourceForItem(IIContent.itemWeaponUpgrade.getStack(WeaponUpgrade.SEMI_AUTOMATIC)))
 				.addSource("long_barrel", getSourceForItem(IIContent.itemWeaponUpgrade.getStack(WeaponUpgrade.EXTENDED_BARREL)));
+		addEntry("weaponry/grenades");
+		addEntry("weaponry/mortar")
+				.addSource("mortar", getSourceForItem(new ItemStack(IIContent.itemMortar)));
+		addEntry("weaponry/ammocrate")
+				.addSource("crafting", getSourceForItems(IIContent.blockMetalDevice.getStack(IIBlockTypes_MetalDevice.AMMUNITION_CRATE)));
+		addEntry("weaponry/casing_pouch")
+				.addSource("crafting", getSourceForItems(IIContent.itemCasingPouch.getStack(1)));
 
-		addEntry("light_engineer_armor")
+		//Items in Armor and Tools folder
+		addEntry("armortools/light_engineer_armor")
 				.addSource("lea", getSourceForItems(new ItemStack(IIContent.itemLightEngineerHelmet), new ItemStack(IIContent.itemLightEngineerChestplate), new ItemStack(IIContent.itemLightEngineerLeggings), new ItemStack(IIContent.itemLightEngineerBoots)))
 				.addSource("gas_mask", getSourceForItems(IIContent.itemArmorUpgrade.getStack(ArmorUpgrades.GASMASK)))
 				.addSource("ir_headgear", getSourceForItems(IIContent.itemArmorUpgrade.getStack(ArmorUpgrades.INFILTRATOR_GEAR)))
@@ -154,39 +162,28 @@ public void addPages()
 				.addSource("flippers", getSourceForItems(IIContent.itemArmorUpgrade.getStack(ArmorUpgrades.FLIPPERS)))
 				.addSource("snow_rackets", getSourceForItems(IIContent.itemArmorUpgrade.getStack(ArmorUpgrades.SNOW_RACKETS)))
 				.addSource("internal_springs", getSourceForItems(IIContent.itemArmorUpgrade.getStack(ArmorUpgrades.INTERNAL_SPRINGS)));
+		addEntry("armortools/flagpole");
+		addEntry("armortools/mine_detector")
+				.addSource("mine_detector", getSourceForItem(new ItemStack(IIContent.itemMineDetector)));
+		addEntry("armortools/trench_shovel")
+				.addSource("trench_shovel", getSourceForItem(new ItemStack(IIContent.itemTrenchShovel)));
 
-		addEntry("ammocrate")
-				.addSource("crafting", getSourceForItems(IIContent.blockMetalDevice.getStack(IIBlockTypes_MetalDevice.AMMUNITION_CRATE))
-				);
-		addEntry("casing_pouch")
-				.addSource("crafting", getSourceForItems(IIContent.itemCasingPouch.getStack(1))
-				);
-
-		addEntry("emplacement");
-		addEntry("emplacement_weapons");
-		addEntry("chemdispenser")
+		//Items in Static Defenses folder
+		addEntry("staticdefense/artillery_howitzer");
+		addEntry("staticdefense/ballistic_computer");
+		addEntry("staticdefense/emplacement");
+		addEntry("staticdefense/emplacement_weapons");
+		addEntry("staticdefense/chemdispenser")
 			.addSource("chemical_dispenser", getSourceForItem(IIContent.blockDataConnector.getStack(IIBlockTypes_Connector.CHEMICAL_DISPENSER)));
-		addEntry("flagpole");
-		addEntry("explosives_mines")
+		addEntry("staticdefense/fortifications")
+			.addSource("sandbags", getSourceForItem(IIContent.blockSandbags.getStack(IIBlockTypes_Sandbags.SANDBAGS)))
+			.addSource("anti_tank_trap", getSourceForItem(IIContent.blockMetalFortification1.getStack(IIBlockTypes_MetalFortification1.TANK_TRAP)));
+		addEntry("staticdefense/explosives_mines")
 				.addSource("crafting_radio_equipped_satchel", getSourceForItems(IIContent.itemAmmoCasing.getStack(Casing.RADIO_EXPLOSIVES)))
 				.addSource("landmines", getSourceForItem((IIContent.blockTellermine.getStack(BlockIIMine.IIBlockTypes_Mine.MAIN))))
 				.addSource("tripmine", getSourceForItem((IIContent.blockTripmine.getStack(BlockIIMine.IIBlockTypes_Mine.MAIN))))
 				.addSource("navalmine", getSourceForItem((IIContent.itemNavalMine.getStack(ItemIIAmmoBase.AmmoParts.BULLET))));
-		addEntry("grenades");
-		addEntry("fortifications")
-				.addSource("sandbags", getSourceForItem(IIContent.blockSandbags.getStack(IIBlockTypes_Sandbags.SANDBAGS)))
-				.addSource("anti_tank_trap", getSourceForItem(IIContent.blockMetalFortification1.getStack(IIBlockTypes_MetalFortification1.TANK_TRAP)));
-
-		addEntry("mine_detector")
-				.addSource("mine_detector", getSourceForItem(new ItemStack(IIContent.itemMineDetector)));
-		addEntry("mortar")
-				.addSource("mortar", getSourceForItem(new ItemStack(IIContent.itemMortar)));
-		addEntry("trench_shovel")
-				.addSource("trench_shovel", getSourceForItem(new ItemStack(IIContent.itemTrenchShovel)));
-		addEntry("artillery_howitzer");
-		addEntry("ballistic_computer");
-		addEntry("explosive_mine_sign")
+		addEntry("staticdefense/explosive_mine_sign")
 				.addSource("mine_sign", getSourceForItem(new ItemStack(IIContent.blockMineSign)));
-
 	}
 }

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/emplacement.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/staticdefense/emplacement.md

@@ -1,6 +1,6 @@
 # meta
 Emplacement
-Locked and Loaded(TM)
+Locked and Loaded!
 
 # 0
 |[multiblock]{mb:"II:Emplacement"}|
@@ -19,7 +19,7 @@ The different weapons requires different types of [ammunition](bullet_production
 **Emplacement** weapons can be damaged and automatically repaired. You can set up the minimal threshold of the emplacement weapon's health before it goes into repair state.
 During repair, it will hide inside the Emplacement and will not react to commands. Note that Emplacements **can be destroyed** if enough damage is inflicted to the gun itself, which also means that you will lose resources used to construct it.
 # 4
-Emplacements allow storing up to [4 target filtering tasks]. Each task has 3 basic groups on which it filters the entity. The first one is the Type: a mob, animal, vehicle or shell, additional parameters (id) can be specified. The second is a name and the third is a team. The parameters within a group are joined using OR and then AND with other groups. For example: select all mobs or animals from team "a" and "b" with name "c".
+Emplacements allow storing up to [4 target filtering tasks]. Each task has [3 basic groups] on which it filters the entity. The first one is the [Type:] a mob, animal, vehicle or shell, additional parameters (id) can be specified. The second is a [name] and the third is a [team]. The parameters within a group are joined using OR and then AND with other groups. For example: select all mobs or animals from team "a" and "b" with name "c".
 # 5
 **Attention!** The Engineering Department(TM) is not liable for any property damage or death inflicted by incorrect targeting inputs.
 *Sign below to confirm you have read and understood this warning.*<br>

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/emplacement_weapons.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/staticdefense/emplacement_weapons.md

@@ -8,7 +8,7 @@ Several weapons with numerous strengths and weaknesses can be installed to creat
 
 # mg0
 **Machinegun**<br>
-This Emplacement is the most basic and *cheapest* of all the Emplacements available. It is a reliable choice for dealing with soft ground targets or light vehicles, when using [armor-piercing] ammunition.
+This Emplacement is the most basic and *cheapest* of all the Emplacements available. It is a reliable choice for dealing with soft ground targets or light vehicles, when using [armor-piercing long bullets] for ammunition.
 # mg1
 The **Machinegun** Emplacement comes in 3 variants: [Default], [Heavy Barreled], and [Water-Cooled], which are identical in function to those present in the [infantry version](machinegun.md) of the Machinegun.
 Take note, this weapon does not use [magazines](magazines.md). [Loose bullets have to be provided through the emplacement input port]. Due to its limited pitch, the MG Emplacement is a poor choice for firing at air targets.
@@ -35,7 +35,7 @@ Fortunately, the **Heavy Railgun** possesses a high armor-piercing capability, s
 
 # cpds0
 **Counter-Projectile Defense System**<br>
-A pinnacle of computer technology, mechanical skill and sophisticated targeting software, this Emplacement is the worst enemy of anything that can fly, walk, or swim.
+A pinnacle of computer technology, mechanical skill and sophisticated targeting software, this Emplacement is the worst enemy of anything that can fly, walk, or swim. It uses [long bullets].
 # cpds1
 Due to the astounding rate of fire, as well as fast tracking and response abilities, it is almost [impossible for targets to evade].
 Thanks to its advanced targeting system, it is the [best weapon for anti-projectile defense purposes], with the capability to [shoot down artillery projectiles in mid air]. In order to do that, it needs to be linked to a [Radar](radar.md) or [Observers](#ir_observer0) in order to maximize the chances of successful interception.

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/fortifications.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/staticdefense/fortifications.md

@@ -1,5 +1,5 @@
 # meta
-Field Defenses
+Fortifications
 They shall not pass!
 
 # 0

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/assault_rifle.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/weaponry/assault_rifle.md

@@ -10,7 +10,7 @@ A powerful, fully automatic weapon, [assault rifles] utilize the [intermediate b
 Sneak and scroll the mouse wheel to change modes.
 
 # 2
-__**Available Modifications**__<br>
+Available Modifications:<br>
 
 [Scope](weapon_upgrades.md#7)
 [Infrared Scope](weapon_upgrades.md#8)

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/machinegun.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/weaponry/machinegun.md

@@ -5,10 +5,10 @@ Property of Hans
 |[crafting]{source:"machinegun"}|
 The Machinegun is a pioneering, sophisticated new invention that allows effective defense against all sorts of threats. Unlike most manned weapons, the machine gun [cannot be fired on the go]. In order to fire, it has to be placed on a block with enough space.
 # 1
-The MG uses [magazines](magazines.md), which can be loaded with bullets in the [Packer](packer.md). While firing bullets, casings drop on the ground to be picked up. The MG is prone to overheating, dependent on the firing rate. The gun, like most modern-day equipment, allows for different configurations using [Upgrades](weapon_upgrades). A [compendium](#2) is available on the following page.
+The MG uses [magazines](magazines.md), which can be loaded with [long bullets] in the [Packer](packer.md). While firing bullets, [casings] drop on the ground to be picked up normally or with the [Casing Pouch](casing_pouch.md). The MG is prone to overheating, dependent on the firing rate. The gun, like most modern-day equipment, allows for different configurations using [Upgrades](weapon_upgrades). A [compendium](#2) is available on the following page.
 
 # 2
-__**Available Modifications**__<br>
+Available Modifications:<br>
 
 [Heavy Barrel](weapon_upgrades.md#1)
 [Water Cooled Barrel](weapon_upgrades.md#2)

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/rifle.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/weaponry/rifle.md

@@ -4,7 +4,7 @@ This is my rifle.
 # 0
 |[item_display]{source:""}|
 The rifle is the warring Engineer's best friend. There are many like it, but this one is yours.
-Rifles use [intermediate bullets]. An unmodified rifle does not use a magazine, rather, it is [fed loose bullets, one at a time]. It supports a limited set of [modifications](#3).
+Rifles use [long bullets]. An unmodified rifle does not use a magazine, rather, it is [fed loose bullets, one at a time]. It supports a limited set of [modifications](#3).
 # 1
 |[crafting]{source:""}|
 Fabricated from simple parts, the [Handmade Rifle] is a tried and true weapon that has seen many a battle and likely the first weapon a marksman Engineer will handle.
@@ -16,7 +16,7 @@ Fabricated with precision, the [Rifle] is an improvement over the handmade versi
 Its reduced weight allows [quicker readying time].
 
 # 3
-__**Available Modifications**__<br>
+Available Modifications:<br>
 
 [Scope](weapon_upgrades.md#7)
 [Semi-auto Firing Mechanism](weapon_upgrades.md#20)

src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/submachinegun.md → src/main/resources/assets/immersiveintelligence/ie_manual/en_us/ii_warfare/weaponry/submachinegun.md

@@ -7,11 +7,11 @@ Sure, I believe ya!
 The Submachine gun, often referred to as the SMG, is an infantry weapon designed for close-to-medium range engagements. The SMG can be [modified](#2) to improve certain aspects of the gun.
 
 # intro2
-The SMG is relatively cheap to manufacture and produce ammo for, making it an ideal choice for [close combat], which requires [fast-paced maneuvers] and a [high rate of fire].<br>
+The SMG is relatively cheap to manufacture and produce [short bullets] for, making it an ideal choice for [close combat], which requires [fast-paced maneuvers] and a [high rate of fire].<br>
 Keep in mind that the SMG [loses its accuracy with greater distance to the target]. It is advised to use [Railguns](railgun), [rifles](rifle.md), or [Artillery Weapons](artillery_howitzer.md) for long range engagements instead.
 
 # 2
-__**Available Modifications**__<br>
+Available Modifications:<br>
 
 [Bayonet](revolver#revolver1)
 [Bottom Loader](weapon_upgrades.md#13)

src/main/resources/assets/immersiveintelligence/lang/en_us.lang

@@ -2683,6 +2683,9 @@ ie.manual.category.ii_other.name=Other
 
 ie.manual.folder.functions=Function Reference
 ie.manual.folder.computers=Computers
+ie.manual.folder.weaponry=Infantry Weapons
+ie.manual.folder.staticdefense=Static Defenses
+ie.manual.folder.armortools=Armor and Tools
 
 ie.manual.entry.traits.level_beginner=Complexity: Pre-Industrial
 ie.manual.entry.traits.level_early_industrial=Complexity: Early Industrial