From 26b5d3915303961893d11a3e176f949ac638fafb Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Tue, 20 Mar 2018 22:28:31 +0100
Subject: [PATCH] Recipes, compressed biomass

---
 assets/hbm/lang/de_DE.lang                    |   1 +
 assets/hbm/lang/en_US.lang                    |   1 +
 assets/hbm/textures/items/book_of_boxcars.png | Bin 0 -> 267 bytes
 .../textures/items/book_of_boxcars_locked.png | Bin 0 -> 354 bytes
 ...geting.png => circuit_targeting_tier1.png} | Bin
 com/hbm/handler/FuelHandler.java              |   2 ++
 com/hbm/inventory/MachineRecipes.java         |  33 ++++++++++++++++--
 com/hbm/items/ModItems.java                   |   5 ++-
 com/hbm/items/tool/ItemAssemblyTemplate.java  |  13 +++++--
 com/hbm/main/CraftingManager.java             |   2 ++
 10 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 assets/hbm/textures/items/book_of_boxcars.png
 create mode 100644 assets/hbm/textures/items/book_of_boxcars_locked.png
 rename assets/hbm/textures/items/{circuit_targeting.png => circuit_targeting_tier1.png} (100%)

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 2d2938ebe..7d5c1dbb5 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -732,6 +732,7 @@ item.magnet_circular.name=Flachmagnet
 item.cyclotron_tower.name=Zyklotronenturm
 item.plate_dalekanium.name=Wütendes Metall
 item.biomass.name=Biomasse
+item.biomass_compressed.name=Verdichtete Biomasse
 item.component_limiter.name=Stabilisatorkomponente
 item.component_emitter.name=Emitterkomponente
 item.catalyst_clay.name=Tonerde-Katalysator
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index 14cab97d6..5bf26bcb0 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -735,6 +735,7 @@ item.magnet_circular.name=Flat Magnet
 item.cyclotron_tower.name=Cyclotron Tower
 item.plate_dalekanium.name=Angry Metal
 item.biomass.name=Biomass
+item.biomass_compressed.name=Compressed Biomass
 item.component_limiter.name=Stabilizer Component
 item.component_emitter.name=Emitter Component
 item.catalyst_clay.name=Clay Catalyst
diff --git a/assets/hbm/textures/items/book_of_boxcars.png b/assets/hbm/textures/items/book_of_boxcars.png
new file mode 100644
index 0000000000000000000000000000000000000000..64c1bfede70174c764f2c770e12d1d796c7c3e0c
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<R9{MaSXBO
z-8$Kk>#%}=YrL0Pp{RgOf63g(-xL&&O9&MN$1dwOS-I74TMHk@xfk;P{#z9ot=h6+
z>pbrTnX}AdWaTxMrZosSiQO?d8y%Pa?%`g2LB<E0!uQ;>ja6A<EwJ@A!-KHB4X^*L
z5Zq7!)HOfu&AO}0m6~Ig+)MG@a*gT1oW;4(bBe#z{!iz;Zx<Wr^eeJ1OTZ~Xg3W~`
znTJ7%slkvf`>pilST?0Y7Jboj?=Sz5P!rqC5a5-2G$PE#XZd5sEVqyp|2wzW1AW8b
M>FVdQ&MBb@041+wqyPW_

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/book_of_boxcars_locked.png b/assets/hbm/textures/items/book_of_boxcars_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5d698ab250eef855884458d0a08e18fbcf89ac4
GIT binary patch
literal 354
zcmV-o0iFJdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0003QNkl<ZIE|%~F>b>!3`L)VEM^x227Cl>1$+dfa|U0fSLob3^b(m1AHncc
z=mG|W7!U$f8ZxMh?W(ct4&fq-BB{?$5+0OfR`NXe|2dE2nB3cr03zZ6oO7GOX_`ju
z$9sddb~8y;Ro+^QQVJ&YhtT2W+j0sDIYo+6N>P?2fL|p5I48e>vmPdzg5xE8J_%qs
z2UN|v2sBN@FboTlr4AACX`14k+vQ;L_u;uBv94<Xj4@<chB1b&>z4PA_h$fat~Xxa
zzSdo6+cx^Oh(ysHV83-SG1nV@B6g<B=Xnn750kYvK8bT+-}h*(DT)FBtu+8eQBc=)
z6zLxhwANfMm*pPnTM|NA#zjOHW4HscWqMeC0JBSSUO&)Png9R*07*qoM6N<$g0x<Y
AtN;K2

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/circuit_targeting.png b/assets/hbm/textures/items/circuit_targeting_tier1.png
similarity index 100%
rename from assets/hbm/textures/items/circuit_targeting.png
rename to assets/hbm/textures/items/circuit_targeting_tier1.png
diff --git a/com/hbm/handler/FuelHandler.java b/com/hbm/handler/FuelHandler.java
index b181cb371..cc818b274 100644
--- a/com/hbm/handler/FuelHandler.java
+++ b/com/hbm/handler/FuelHandler.java
@@ -14,6 +14,8 @@ public class FuelHandler implements IFuelHandler {
 
 		if(fuel.getItem().equals(ModItems.solid_fuel))
 			return 3200;
+		if(fuel.getItem().equals(ModItems.biomass_compressed))
+			return 8000;
 		if(fuel.getItem().equals(ModItems.powder_coal))
 			return 1600;
 		if(fuel.getItem().equals(ModItems.scrap))
diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java
index 5f165839f..2fc4792d0 100644
--- a/com/hbm/inventory/MachineRecipes.java
+++ b/com/hbm/inventory/MachineRecipes.java
@@ -292,6 +292,8 @@ public class MachineRecipes {
 				return new ItemStack(Items.emerald);
 			if(input == ModItems.pellet_coal)
 				return new ItemStack(Items.diamond);
+			if(input == ModItems.biomass)
+				return new ItemStack(ModItems.biomass_compressed);
 		}
 		
 		if(stamps_plate.contains(stamp)) {
@@ -376,6 +378,7 @@ public class MachineRecipes {
 		recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.powder_diamond) }, getPressResultNN(stamps_flat.get(0), ModItems.powder_diamond));
 		recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.powder_emerald) }, getPressResultNN(stamps_flat.get(0), ModItems.powder_emerald));
 		recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.pellet_coal) }, getPressResultNN(stamps_flat.get(0), ModItems.pellet_coal));
+		recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.biomass) }, getPressResultNN(stamps_flat.get(0), ModItems.biomass));
 
 		recipes.put(new Object[] { i_stamps_plate, new ItemStack(Items.iron_ingot) }, getPressResultNN(stamps_plate.get(0), Items.iron_ingot));
 		recipes.put(new Object[] { i_stamps_plate, new ItemStack(Items.gold_ingot) }, getPressResultNN(stamps_plate.get(0), Items.gold_ingot));
@@ -2990,7 +2993,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.coil_tungsten, 5));
 			list.add(new ItemStack(ModItems.motor, 2));
 			break;
-		case FLEIIJA_IGNITER:
+		case FLEIJA_IGNITER:
 			list.add(new ItemStack(ModItems.plate_titanium, 6));
 			list.add(new ItemStack(ModItems.wire_schrabidium, 2));
 			list.add(new ItemStack(ModItems.circuit_schrabidium, 1));
@@ -3005,6 +3008,23 @@ public class MachineRecipes {
 			list.add(new ItemStack(Blocks.tnt, 3));
 			list.add(new ItemStack(ModItems.plate_schrabidium, 8));
 			break;
+		case SOLINIUM_IGNITER:
+			list.add(new ItemStack(ModItems.plate_titanium, 4));
+			list.add(new ItemStack(ModItems.wire_advanced_alloy, 2));
+			list.add(new ItemStack(ModItems.circuit_schrabidium, 1));
+			list.add(new ItemStack(ModItems.coil_gold, 1));
+			break;
+		case SOLINIUM_CORE:
+			list.add(new ItemStack(ModItems.nugget_solinium, 9));
+			list.add(new ItemStack(ModItems.nugget_euphemium, 1));
+			break;
+		case SOLINIUM_PROPELLANT:
+			list.add(new ItemStack(Blocks.tnt, 3));
+			list.add(new ItemStack(ModItems.neutron_reflector, 2));
+			list.add(new ItemStack(ModItems.plate_polymer, 6));
+			list.add(new ItemStack(ModItems.wire_tungsten, 6));
+			list.add(new ItemStack(ModItems.biomass_compressed, 4));
+			break;
 		case COMPONENT_LIMITER:
 			list.add(new ItemStack(ModItems.hull_big_steel, 2));
 			list.add(new ItemStack(ModItems.plate_steel, 32));
@@ -3737,7 +3757,7 @@ public class MachineRecipes {
 		case MIKE_COOLER:
 			output = new ItemStack(ModItems.mike_cooling_unit, 1);
 			break;
-		case FLEIIJA_IGNITER:
+		case FLEIJA_IGNITER:
 			output = new ItemStack(ModItems.fleija_igniter, 1);
 			break;
 		case FLEIJA_CORE:
@@ -3746,6 +3766,15 @@ public class MachineRecipes {
 		case FLEIJA_PROPELLANT:
 			output = new ItemStack(ModItems.fleija_propellant, 1);
 			break;
+		case SOLINIUM_IGNITER:
+			output = new ItemStack(ModItems.solinium_igniter, 1);
+			break;
+		case SOLINIUM_CORE:
+			output = new ItemStack(ModItems.solinium_core, 1);
+			break;
+		case SOLINIUM_PROPELLANT:
+			output = new ItemStack(ModItems.solinium_propellant, 1);
+			break;
 		case COMPONENT_LIMITER:
 			output = new ItemStack(ModItems.component_limiter, 1);
 			break;
diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java
index f17d7a811..4efc4a22c 100644
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@@ -230,8 +230,9 @@ public class ModItems {
 	public static Item fragment_lanthanium;
 	public static Item fragment_actinium;
 	public static Item fragment_meteorite;
-	
+
 	public static Item biomass;
+	public static Item biomass_compressed;
 	
 	public static Item coil_copper;
 	public static Item coil_copper_torus;
@@ -1392,6 +1393,7 @@ public class ModItems {
 		fragment_meteorite = new Item().setUnlocalizedName("fragment_meteorite").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_meteorite");
 		
 		biomass = new Item().setUnlocalizedName("biomass").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":biomass");
+		biomass_compressed = new Item().setUnlocalizedName("biomass_compressed").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":biomass_compressed");
 
 		coil_copper = new Item().setUnlocalizedName("coil_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper");
 		coil_copper_torus = new Item().setUnlocalizedName("coil_copper_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper_torus");
@@ -2487,6 +2489,7 @@ public class ModItems {
 		
 		//Things that look like rotten flesh but aren't
 		GameRegistry.registerItem(biomass, biomass.getUnlocalizedName());
+		GameRegistry.registerItem(biomass_compressed, biomass_compressed.getUnlocalizedName());
 
 		//Nuggets
 		GameRegistry.registerItem(nugget_uranium, nugget_uranium.getUnlocalizedName());
diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java
index 2f1aa02cd..e7d8557a1 100644
--- a/com/hbm/items/tool/ItemAssemblyTemplate.java
+++ b/com/hbm/items/tool/ItemAssemblyTemplate.java
@@ -230,9 +230,12 @@ public class ItemAssemblyTemplate extends Item {
 		MIKE_TANK,
 		MIKE_DEUT,
 		MIKE_COOLER,
-		FLEIIJA_IGNITER,
+		FLEIJA_IGNITER,
 		FLEIJA_CORE,
 		FLEIJA_PROPELLANT,
+		SOLINIUM_IGNITER,
+		SOLINIUM_CORE,
+		SOLINIUM_PROPELLANT,
 		SCHRABIDIUM_HAMMER,
 		COMPONENT_LIMITER,
 		COMPONENT_EMITTER,
@@ -727,12 +730,18 @@ public class ItemAssemblyTemplate extends Item {
 			return 200;
 		case MIKE_COOLER:
 			return 200;
-		case FLEIIJA_IGNITER:
+		case FLEIJA_IGNITER:
 			return 300;
 		case FLEIJA_CORE:
 			return 500;
 		case FLEIJA_PROPELLANT:
 			return 400;
+		case SOLINIUM_IGNITER:
+			return 400;
+		case SOLINIUM_CORE:
+			return 400;
+		case SOLINIUM_PROPELLANT:
+			return 350;
 		case SCHRABIDIUM_HAMMER:
 			return 1000;
 		case COMPONENT_LIMITER:
diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
index de0daacfc..ebb1d1f15 100644
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@@ -223,6 +223,8 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.powder_actinium_tiny, 9), new Object[] { "#", '#', ModItems.powder_actinium });
 		GameRegistry.addRecipe(new ItemStack(ModItems.powder_meteorite, 1), new Object[] { "###", "###", "###", '#', ModItems.powder_meteorite_tiny });
 		GameRegistry.addRecipe(new ItemStack(ModItems.powder_meteorite_tiny, 9), new Object[] { "#", '#', ModItems.powder_meteorite });
+		GameRegistry.addRecipe(new ItemStack(ModItems.ingot_solinium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_solinium });
+		GameRegistry.addRecipe(new ItemStack(ModItems.nugget_solinium, 9), new Object[] { "#", '#', ModItems.ingot_solinium });
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', "plateSteel", 'L', "plateLead" }));
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_uranium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium });