liquidized trolling

src/main/java/com/hbm/crafting/MineralRecipes.java

@@ -138,9 +138,9 @@ public class MineralRecipes {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_uranium_fuel, 6), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u235 });
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium235" }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU235" }));
-		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_pu_mix, ModItems.billet_pu_mix });
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "nuggetUranium238", "nuggetUranium238" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "tinyU238", "tinyU238" }));
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu_mix });
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "tinyU238", "tinyU238", "tinyU238", "tinyU238" }));
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_pu_mix, 3), new Object[] { ModItems.billet_pu239, ModItems.billet_pu239, ModItems.billet_pu240 });
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu_mix, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240" }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu_mix, 1), new Object[] { "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240" }));

src/main/java/com/hbm/inventory/gui/GUIScreenGuide.java

@@ -169,10 +169,10 @@ public class GUIScreenGuide extends GuiScreen {
  					
  					float topOffset;
  					
- 					if(textBox.y == -1) {
+ 					if(textBox.yOffset == -1) {
  	 					topOffset = page.title == null ? 0 : 6 / titleScale;
  					} else {
- 						topOffset = textBox.y;
+ 						topOffset = textBox.yOffset;
  					}
  					
  					for(int l = 0; l < lines.size(); l++) {

src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java

@@ -144,15 +144,15 @@ public class SILEXRecipes {
 			
 			// LEP //
 			recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i), new SILEXRecipe(600, 100, 1)
-					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 90 - i * 15))
-					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 10 * i))
-					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 5 * i)) );
+					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 90 - i * 12))
+					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 8 * i))
+					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 4 * i)) );
 			
 			recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i + 5), new SILEXRecipe(600, 100, 1)
 					.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
-					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 89 - i * 15))
-					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 10 * i))
-					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 5 * i)) );
+					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 89 - i * 12))
+					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 8 * i))
+					.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 4 * i)) );
 			
 			// MEP //
 			recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i), new SILEXRecipe(600, 100, 1)

src/main/java/com/hbm/items/tool/ItemGuideBook.java

@@ -161,20 +161,22 @@ public class ItemGuideBook extends Item {
 				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter2.png"), 105, 82, 40));
 		pages.add(new GuidePage().addTitle("book.starter.title3", 0x800000, 1F)
 				.addText("book.starter.page3", 2F)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter3a.png"), 10, 95, 39, 54)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter3b.png"), 55, 95, 39, 54));
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter3a.png"), 10, 95, 28, 45)
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter3b.png"), 65, 95, 28, 45));
 		pages.add(new GuidePage().addTitle("book.starter.title4", 0x800000, 1F)
-				.addText("book.starter.page4", 1.4F, 0, 0, 64)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/stamp_iron_flat.png"), 72, 30, 32, 32)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/assembly_template.png"), 72, 78, 32, 32)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/chemistry_template.png"), 72, 127, 32, 32));
-		
-		/*pages.add(new GuidePage("book.starter.page1").setScale(2F).addTitle("book.starter.title1", 0x800000, 1F)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter1.png"), 96, 101, 56));
-		pages.add(new GuidePage("book.starter.page2").setScale(2F).addTitle("book.starter.title2", 0x800000, 1F)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter2.png"), 105, 82, 40));
-		pages.add(new GuidePage("book.starter.page3").setScale(2F).addTitle("book.starter.title3", 0x800000, 1F)
-				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter3.png"), 105, 82, 40));*/
+				.addText("book.starter.page4", 1.4F, 0, 6, 72)
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/template_folder.png"), 72, 30, 24, 24)
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/stamp_iron_flat.png"), 72, 60, 24, 24)
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/assembly_template.png"), 72, 90, 24, 24)
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/items/chemistry_template.png"), 72, 120, 24, 24));
+		pages.add(new GuidePage().addTitle("book.starter.title5", 0x800000, 1F)
+				.addText("book.starter.page5", 2F));
+		pages.add(new GuidePage().addTitle("book.starter.title6", 0x800000, 1F)
+				.addText("book.starter.page6a", 2F)
+				.addText("book.starter.page6b", 2f, 0, 96, 100)
+				.addImage(new ResourceLocation(RefStrings.MODID + ":textures/gui/book/starter6.png"), 9, 89, 84, 36));
+		pages.add(new GuidePage().addTitle("book.starter.title7", 0x800000, 1F)
+				.addText("book.starter.page7", 2F));
 		
 		return pages;
 	}
@@ -188,14 +190,6 @@ public class ItemGuideBook extends Item {
 		public List<GuideText> texts = new ArrayList();
 		public List<GuideImage> images = new ArrayList();
 		
-		/*public String text;
-		public ResourceLocation image;
-		public float scale = 1F;
-		public int x;
-		public int y;
-		public int sizeX;
-		public int sizeY;*/
-		
 		public GuidePage() { }
 		
 		public GuidePage addTitle(String title, int color, float scale) {
@@ -215,63 +209,33 @@ public class ItemGuideBook extends Item {
 			return this;
 		}
 		
-		public GuidePage addText(String text, int xOffset, int y, int width) {
-			texts.add(new GuideText(text).setSize(xOffset, y, width));
+		public GuidePage addText(String text, int xOffset, int yOffset, int width) {
+			texts.add(new GuideText(text).setSize(xOffset, yOffset, width));
 			return this;
 		}
 		
-		public GuidePage addText(String text, float scale, int xOffset, int y, int width) {
-			texts.add(new GuideText(text).setSize(xOffset, y, width).setScale(scale));
+		public GuidePage addText(String text, float scale, int xOffset, int yOffset, int width) {
+			texts.add(new GuideText(text).setSize(xOffset, yOffset, width).setScale(scale));
 			return this;
 		}
 		
-		public GuidePage addImage(ResourceLocation image, int x, int y, int sizeX, int sizeY) {
-			images.add(new GuideImage(image, x, y, sizeX, sizeY));
+		public GuidePage addImage(ResourceLocation image, int xOffset, int yOffset, int sizeX, int sizeY) {
+			images.add(new GuideImage(image, xOffset, yOffset, sizeX, sizeY));
 			return this;
 		}
 		
-		public GuidePage addImage(ResourceLocation image, int y, int sizeX, int sizeY) {
-			images.add(new GuideImage(image, -1, y, sizeX, sizeY));
+		//xOffset = -1 for automatic centering
+		public GuidePage addImage(ResourceLocation image, int yOffset, int sizeX, int sizeY) {
+			images.add(new GuideImage(image, -1, yOffset, sizeX, sizeY));
 			return this;
 		}
-		
-		/*public GuidePage(String text) {
-			this.text = text;
-		}
-		
-		public GuidePage setScale(float scale) {
-			this.scale = scale;
-			return this;
-		}
-		
-		public GuidePage addTitle(String title, int color, float scale) {
-			this.title = title;
-			this.titleColor = color;
-			this.titleScale = scale;
-			return this;
-		}
-		
-		public GuidePage addImage(ResourceLocation image, int x, int y, int sizeX, int sizeY) {
-			
-			this.image = image;
-			this.x = x;
-			this.y = y;
-			this.sizeX = sizeX;
-			this.sizeY = sizeY;
-			return this;
-		}
-		
-		//if the x-coord is -1 then it will automatically try to center the image horizontally
-		public GuidePage addImage(ResourceLocation image, int y, int sizeX, int sizeY) {
-			return addImage(image, -1, y, sizeX, sizeY);
-		}*/
 	}
 	
 	public static class GuideText {
 		public String text;
 		public float scale = 1F;
 		public int xOffset = 0;
-		public int y = -1;
+		public int yOffset = -1;
 		public int width = 100;
 		
 		public GuideText(String text) {
@@ -283,9 +247,10 @@ public class ItemGuideBook extends Item {
 			return this;
 		}
 		
-		public GuideText setSize(int xOffset, int y, int width) {
+		//yOffset = -1, xOffset = 0 for default
+		public GuideText setSize(int xOffset, int yOffset, int width) {
 			this.xOffset = xOffset;
-			this.y = y;
+			this.yOffset = yOffset;
 			this.width = width;
 			return this;
 		}

src/main/resources/assets/hbm/lang/en_US.lang

@@ -208,11 +208,16 @@ book.starter.cover=An Industrialist's$Guide to Rebuilding$Society
 book.starter.title1=Introduction
 book.starter.page1=If you're reading this, it's highly likely that society, in one way or another, has collapsed entirely. Governments, countries, and authority are a concept of the past - along with all of the amenities of civilized life. As such, this guide will inform you how to change that by recreating the industry and technology of the past for the improvement of your own life.
 book.starter.title2=Coal & Mustard Gas
-book.starter.page2=Whilst it is impossible to predict the actual state of the world in a post-apocalyptic time, it's not unlikely that war and industry in its current form may not have ended. To protect your own lungs, an effective and cheap way is to urinate on some cloth to make a trench mask, to protect you from coal dust or mustard gas, if you ever encounter either.
+book.starter.page2=Whilst it is impossible to predict the actual state of the world in a post-apocalyptic time, it's not unlikely that war and industry in its current form may not have ended. To protect your own lungs, an effective and cheap way is to urinate on some §lcloth§r to make a §ltrench mask§r, to protect you from coal dust or mustard gas, if you ever encounter either.
 book.starter.title3=Anvils & Presses
-book.starter.page3=The quintessentials to beginning your industrial revitalization is an anvil and a burner press. The anvil will allow you to manually craft together early machinery such as the Assembler, whilst the burner press will let you make plates, wires, and circuits that you cannot hammer together with an anvil.
+book.starter.page3=The quintessentials to beginning your industrial revitalization is an §lanvil§r and a §lburner press§r. The anvil will allow you to manually craft together early machinery such as the Assembler, whilst the burner press will let you make plates, wires, and circuits that you cannot hammer together with an anvil.
 book.starter.title4=Templates
-book.starter.page4=In order to stamp metal into useful shapes, assemble machinery, and perform chemical reactions, you will need to create a Machine Template Folder to create the various stamps and templates shown to the right.
+book.starter.page4=In order to stamp metal into useful shapes, assemble machinery, and perform chemical reactions, you will need to create a §lMachine Template Folder§r to create the various stamps and templates shown to the right.
+book.starter.title5=Scavenging
+book.starter.page5=Depending on how bad the initial apocalyptic event was to the preexisting structures of the world, there's a likely chance that many useful materials and machine can be salvaged from them directly. Metallic alloys like steel, parts like circuitry, and even fissile material from a nuclear power plant might be awaiting you. Beware certain ruins, however, as there may be an excess of danger lurking there like a snake in the grass; waiting to strike you down with radiation, traps, or indescribable horrors...
+book.starter.title6=Early Machinery
+book.starter.page6a=Two of the first machines you should assemble are the §lBlast Furnace§r and the §lAssembly Machine§r. The former will allow you to create alloys such as §lsteel§r, §lminecraft-grade copper§r, and §ladvanced alloy§r; you will need to use these metals for the bodies of machines, the wiring of circuits, advanced electromagnets, and more.
+book.starter.page6b=The assembler will be used to create practically every other machine described in this guide. You will need a power source, such as a §lCombustion§r §lGenerator§r or §lSolar Boiler§r.
 
 #book.rbmk.cover=HOW 2 RBMK:$The Basics$of Reactor$Construction
 #book.rbmk.title1=Introduction