From dacb220af4b5f93cd2e8c39e5621409646a9c19d Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Tue, 11 Jun 2019 21:23:25 +0200
Subject: [PATCH] cable switch, final touches

---
 assets/hbm/lang/de_DE.lang                    |   1 +
 assets/hbm/lang/en_US.lang                    |   1 +
 .../hbm/textures/blocks/cable_switch_off.png  | Bin 0 -> 371 bytes
 .../hbm/textures/blocks/cable_switch_on.png   | Bin 0 -> 379 bytes
 com/hbm/blocks/ModBlocks.java                 |   3 +
 com/hbm/blocks/machine/CableSwitch.java       |  65 ++++++++++++++++++
 com/hbm/handler/BobmazonOfferFactory.java     |   5 +-
 .../container/ContainerMachineChemplant.java  |   8 +--
 com/hbm/inventory/gui/GUILaunchPadTier1.java  |   2 +-
 .../gui/GUIMachineCompactLauncher.java        |   2 +-
 .../inventory/gui/GUIMachineLaunchTable.java  |   2 +-
 com/hbm/items/ModItems.java                   |  38 +++++-----
 com/hbm/items/tool/ItemAssemblyTemplate.java  |  12 ++++
 com/hbm/lib/HbmChestContents.java             |   1 +
 com/hbm/lib/Library.java                      |  29 ++++++++
 com/hbm/lib/RefStrings.java                   |   2 +-
 com/hbm/main/CraftingManager.java             |   1 +
 com/hbm/main/MainRegistry.java                |   1 +
 .../conductor/TileEntityCableSwitch.java      |   9 +++
 .../TileEntityMachineReactorSmall.java        |   3 +
 20 files changed, 157 insertions(+), 28 deletions(-)
 create mode 100644 assets/hbm/textures/blocks/cable_switch_off.png
 create mode 100644 assets/hbm/textures/blocks/cable_switch_on.png
 create mode 100644 com/hbm/blocks/machine/CableSwitch.java
 create mode 100644 com/hbm/tileentity/conductor/TileEntityCableSwitch.java

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 2fe5afa1b..5d72826d7 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -367,6 +367,7 @@ container.arcFurnace=Lichtbogenofen
 tile.machine_generator.name=Atomreaktor (Alt)
 container.generator=Atomreaktor
 tile.red_wire_coated.name=Geschirmtes rotes Kupferkabel
+tile.cable_switch.name=Stromschalter
 tile.machine_deuterium.name=Deuteriumextraktor
 container.machine_deuterium=Deuteriumextraktor
 tile.machine_battery_potato.name=Kartoffelbatterieblock
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index c6ffcc6a2..52c816fab 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -367,6 +367,7 @@ container.arcFurnace=Arc Furnace
 tile.machine_generator.name=Nuclear Reactor (Old)
 container.generator=Nuclear Reactor
 tile.red_wire_coated.name=Coated Red Copper Cable
+tile.cable_switch.name=Power Switch
 tile.machine_deuterium.name=Deuterium Extractor
 container.machine_deuterium=Deuterium Extractor
 tile.machine_battery_potato.name=Potato Battery Block
diff --git a/assets/hbm/textures/blocks/cable_switch_off.png b/assets/hbm/textures/blocks/cable_switch_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..93946e856b01095cb451bb74659ed955a5b6fd3a
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0003hNkl<ZIE{@{F>b>!3_KFb<N!q<P@r>$0{%edhjlH`XBquLivamR_YAQ!
zI04zgIF)i;G+ZQ#;_;56q-|SQRk%Au1nv%11pv4^+#R%dkMX3cXqpB9AR;AbW@RrT
z#b*IC!!Qg`1ao(oSyhc-(T|K$be{Six7cUb6?REPie><~|0nslV4Jv!Abrk7YiwE$
z3{@2(G6SsH%hx;3XJE4dM1Z%)=PJ&oCRS$ifVu12EwJ0&!OU<toGON7Y-Uh0AWdGl
zTz){W*SY|EpsKTkh)#Xe1nl=GOw%kO7N`b^L$U;Uedx+1cZY;n9IzC-Ov^XS10^LQ
z@!<G(&aY$u^D9uoN6uK2M3y|4_`%3vO$sYThV;uQyF12ltbW@X;PSb-eglI;#~Ngh
REZzVB002ovPDHLkV1mUPm*M~b

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/cable_switch_on.png b/assets/hbm/textures/blocks/cable_switch_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..d75a1e4712f7bc8cebc2d1d5472ecb90629ec360
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0003pNkl<ZIE{^yF>V4u3`L)<p#h|vAW>>MB<ip?$wkse$~AHlP|kovk8*>s
z6brIbtUU2<h=QA4k7vIB|KpM6a_OpyyCWjFJE{tRyW{Re<b6>us>*CO13*M-(ah?<
zh}1k9m>I|85haDYV`hVH0haU3sO02*yXBU6Zko!jh)C58@bJ&!!-#E(pA6Eh*Hvpa
zZIc+PDk9PYT#J{_4^AhTOh5$Q9-jvFFttSIFb{gy=W|#r?l3d<`>z4RU~Fb+FbJBl
z;e7r9y<CP3!UI+9C1mu_*LASlebIHjgxp{-NHHX1kk|XBZgO`d)$)Lq>~h5BhIt4{
zC6Hp_@b{TthXG`@TKRN39o+d?(s(_LZ`-zi3-L(CQle947<nCKcc*RJ!E3t)IKJ-q
Zegk2K%g*E&A%y?{002ovPDHLkV1n0Wsu=(P

literal 0
HcmV?d00001

diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java
index 96b7e943f..6054510d7 100644
--- a/com/hbm/blocks/ModBlocks.java
+++ b/com/hbm/blocks/ModBlocks.java
@@ -372,6 +372,7 @@ public class ModBlocks {
 	public static Block red_wire_coated;
 	public static Block red_cable;
 	public static Block red_pylon;
+	public static Block cable_switch;
 	public static Block rf_cable;
 	public static Block oil_duct_solid;
 	public static Block oil_duct;
@@ -970,6 +971,7 @@ public class ModBlocks {
 		red_cable = new BlockCable(Material.iron).setBlockName("red_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_cable_icon");
 		rf_cable = new BlockRFCable(Material.iron).setBlockName("rf_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":rf_cable_icon");
 		red_pylon = new PylonRedWire(Material.iron).setBlockName("red_pylon").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_pylon");
+		cable_switch = new CableSwitch(Material.iron).setBlockName("cable_switch").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cable_switch_off");
 		oil_duct_solid = new OilDuctSolid(Material.iron).setBlockName("oil_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":oil_duct_solid_alt");
 		oil_duct = new BlockOilDuct(Material.iron).setBlockName("oil_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":oil_duct_icon_alt");
 		gas_duct_solid = new GasDuctSolid(Material.iron).setBlockName("gas_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_solid");
@@ -1541,6 +1543,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(red_cable, red_cable.getUnlocalizedName());
 		GameRegistry.registerBlock(red_wire_coated, red_wire_coated.getUnlocalizedName());
 		GameRegistry.registerBlock(red_pylon, red_pylon.getUnlocalizedName());
+		GameRegistry.registerBlock(cable_switch, cable_switch.getUnlocalizedName());
 		GameRegistry.registerBlock(rf_cable, rf_cable.getUnlocalizedName());
 		GameRegistry.registerBlock(oil_duct, oil_duct.getUnlocalizedName());
 		GameRegistry.registerBlock(oil_duct_solid, oil_duct_solid.getUnlocalizedName());
diff --git a/com/hbm/blocks/machine/CableSwitch.java b/com/hbm/blocks/machine/CableSwitch.java
new file mode 100644
index 000000000..1c87eb5c8
--- /dev/null
+++ b/com/hbm/blocks/machine/CableSwitch.java
@@ -0,0 +1,65 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.conductor.TileEntityCableSwitch;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class CableSwitch extends BlockContainer {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconOn;
+
+	public CableSwitch(Material p_i45386_1_) {
+		super(p_i45386_1_);
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iconRegister) {
+		this.iconOn = iconRegister.registerIcon(RefStrings.MODID + ":cable_switch_on");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":cable_switch_off");
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata) {
+		return metadata == 1 ? iconOn : blockIcon;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityCableSwitch();
+	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote)
+		{
+			return true;
+		} else if(!player.isSneaking())
+		{
+			int meta = world.getBlockMetadata(x, y, z);
+			if(meta == 0) {
+				world.setBlockMetadataWithNotify(x, y, z, 1, 2);
+				world.playSoundEffect(x, y, z, "hbm:block.reactorStart", 1.0F, 1.0F);
+			} else {
+				world.setBlockMetadataWithNotify(x, y, z, 0, 2);
+				world.playSoundEffect(x, y, z, "hbm:block.reactorStart", 1.0F, 0.85F);
+			}
+			
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+}
diff --git a/com/hbm/handler/BobmazonOfferFactory.java b/com/hbm/handler/BobmazonOfferFactory.java
index 4b39912e8..6811347f8 100644
--- a/com/hbm/handler/BobmazonOfferFactory.java
+++ b/com/hbm/handler/BobmazonOfferFactory.java
@@ -85,7 +85,10 @@ public class BobmazonOfferFactory {
 		machines.add(new Offer(new ItemStack(ModBlocks.absorber), Requirement.CHEMICS, 10));
 		machines.add(new Offer(new ItemStack(ModBlocks.absorber_green), Requirement.OIL, 25));
 		machines.add(new Offer(new ItemStack(ModBlocks.decon), Requirement.CHEMICS, 15));
-		
+
+		weapons.add(new Offer(new ItemStack(ModItems.loot_10), Requirement.OIL, 50));
+		weapons.add(new Offer(new ItemStack(ModItems.loot_15), Requirement.OIL, 65));
+		weapons.add(new Offer(new ItemStack(ModItems.loot_misc), Requirement.NUCLEAR, 65));
 		weapons.add(new Offer(new ItemStack(ModBlocks.launch_pad), Requirement.OIL, 95));
 		weapons.add(new Offer(new ItemStack(ModBlocks.machine_radar), Requirement.OIL, 90));
 		weapons.add(new Offer(new ItemStack(ModItems.designator), Requirement.CHEMICS, 35));
diff --git a/com/hbm/inventory/container/ContainerMachineChemplant.java b/com/hbm/inventory/container/ContainerMachineChemplant.java
index c31c57bae..88f86cf39 100644
--- a/com/hbm/inventory/container/ContainerMachineChemplant.java
+++ b/com/hbm/inventory/container/ContainerMachineChemplant.java
@@ -78,14 +78,14 @@ private TileEntityMachineChemplant nukeBoy;
 			ItemStack var5 = var4.getStack();
 			var3 = var5.copy();
 			
-            if (par2 <= 17) {
-				if (!this.mergeItemStack(var5, 18, this.inventorySlots.size(), true))
+            if (par2 <= 20) {
+				if (!this.mergeItemStack(var5, 21, this.inventorySlots.size(), true))
 				{
 					return null;
 				}
 			}
-			else if (!this.mergeItemStack(var5, 6, 18, false))
-				if (!this.mergeItemStack(var5, 0, 4, false))
+			else if (!this.mergeItemStack(var5, 4, 5, false))
+				if (!this.mergeItemStack(var5, 13, 19, false))
 					return null;
 			
 			if (var5.stackSize == 0)
diff --git a/com/hbm/inventory/gui/GUILaunchPadTier1.java b/com/hbm/inventory/gui/GUILaunchPadTier1.java
index 10d5af5aa..e7903ae59 100644
--- a/com/hbm/inventory/gui/GUILaunchPadTier1.java
+++ b/com/hbm/inventory/gui/GUILaunchPadTier1.java
@@ -32,7 +32,7 @@ public class GUILaunchPadTier1 extends GuiInfoContainer {
 		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 53, 160, 16, diFurnace.power, diFurnace.maxPower);
 
 		String[] text = new String[] { "First Slot:",
-				"  -Missile",
+				"  -Missile (no custom ones!)",
 				"  -Carrier Rocket" };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text);
 		
diff --git a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java
index ea9e29318..e7158eb0d 100644
--- a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java
+++ b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java
@@ -45,7 +45,7 @@ public class GUIMachineCompactLauncher extends GuiInfoContainer {
 		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 52, 16, 52, new String[] { "Solid Fuel: " + launcher.solid + "l" });
 		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 113, 34, 6, launcher.power, launcher.maxPower);
 
-		String[] text = new String[] { "Only accepts custom missiles", "of all sizes" };
+		String[] text = new String[] { "Only accepts custom missiles", "of size 10 and 10/15." };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text);
 		
 		String[] text1 = new String[] { "Detonator can only trigger center block." };
diff --git a/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/com/hbm/inventory/gui/GUIMachineLaunchTable.java
index 08bc0e617..ab8552a4b 100644
--- a/com/hbm/inventory/gui/GUIMachineLaunchTable.java
+++ b/com/hbm/inventory/gui/GUIMachineLaunchTable.java
@@ -47,7 +47,7 @@ public class GUIMachineLaunchTable extends GuiInfoContainer {
 		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 25, guiTop + 98, 18, 18, new String[] { "Size 15 & 15/20" });
 		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 43, guiTop + 98, 18, 18, new String[] { "Size 20" });
 
-		String[] text = new String[] { "Only accepts custom missiles", "of size 10 and 10/15." };
+		String[] text = new String[] { "Acepts custom missiles", "of all sizes, as long as the", "correct size setting is selected." };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text);
 		
 		String[] text1 = new String[] { "Detonator can only trigger center block." };
diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java
index a6b10bdb8..f6ab4f7ed 100644
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@@ -2305,16 +2305,16 @@ public class ModItems {
 		cap_star = new Item().setUnlocalizedName("cap_star").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_star");
 		ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":ring_pull");
 
-		recycled_ground = new Item().setUnlocalizedName("recycled_ground").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_ground");
-		recycled_rock = new Item().setUnlocalizedName("recycled_rock").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_rock");
-		recycled_metal = new Item().setUnlocalizedName("recycled_metal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_metal");
-		recycled_refined = new Item().setUnlocalizedName("recycled_refined").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_refined");
-		recycled_organic = new Item().setUnlocalizedName("recycled_organic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_organic");
-		recycled_crystal = new Item().setUnlocalizedName("recycled_crystal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_crystal");
-		recycled_explosive = new Item().setUnlocalizedName("recycled_explosive").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_explosive");
-		recycled_electronic = new Item().setUnlocalizedName("recycled_electronic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_electronic");
-		recycled_nuclear = new Item().setUnlocalizedName("recycled_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_nuclear");
-		recycled_misc = new Item().setUnlocalizedName("recycled_misc").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_misc");
+		recycled_ground = new Item().setUnlocalizedName("recycled_ground").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_ground");
+		recycled_rock = new Item().setUnlocalizedName("recycled_rock").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_rock");
+		recycled_metal = new Item().setUnlocalizedName("recycled_metal").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_metal");
+		recycled_refined = new Item().setUnlocalizedName("recycled_refined").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_refined");
+		recycled_organic = new Item().setUnlocalizedName("recycled_organic").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_organic");
+		recycled_crystal = new Item().setUnlocalizedName("recycled_crystal").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_crystal");
+		recycled_explosive = new Item().setUnlocalizedName("recycled_explosive").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_explosive");
+		recycled_electronic = new Item().setUnlocalizedName("recycled_electronic").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_electronic");
+		recycled_nuclear = new Item().setUnlocalizedName("recycled_nuclear").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_nuclear");
+		recycled_misc = new Item().setUnlocalizedName("recycled_misc").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_misc");
 
 		rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty");
 		rod_th232 = new ItemRadioactive().setUnlocalizedName("rod_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_th232");
@@ -2512,12 +2512,12 @@ public class ModItems {
 		mp_thruster_15_balefire = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 5F, PartSize.SIZE_15).setHealth(25F)					.setUnlocalizedName("mp_thruster_15_balefire");
 		mp_thruster_15_balefire_large = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 7.5F, PartSize.SIZE_15).setHealth(35F)			.setUnlocalizedName("mp_thruster_15_balefire_large");
 		mp_thruster_15_balefire_large_rad = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 7.5F, PartSize.SIZE_15).setAuthor("The Master").setHealth(35F).setRarity(Rarity.UNCOMMON).setUnlocalizedName("mp_thruster_15_balefire_large_rad");
-		mp_thruster_20_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20)									.setUnlocalizedName("mp_thruster_20_kerosene");
-		mp_thruster_20_kerosene_dual = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20)							.setUnlocalizedName("mp_thruster_20_kerosene_dual");
-		mp_thruster_20_kerosene_triple = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20)							.setUnlocalizedName("mp_thruster_20_kerosene_triple");
-		mp_thruster_20_solid = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20)										.setUnlocalizedName("mp_thruster_20_solid");
-		mp_thruster_20_solid_multi = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20)									.setUnlocalizedName("mp_thruster_20_solid_multi");
-		mp_thruster_20_solid_multier = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20)								.setUnlocalizedName("mp_thruster_20_solid_multier");
+		mp_thruster_20_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20).setHealth(30F)					.setUnlocalizedName("mp_thruster_20_kerosene");
+		mp_thruster_20_kerosene_dual = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20).setHealth(30F)				.setUnlocalizedName("mp_thruster_20_kerosene_dual");
+		mp_thruster_20_kerosene_triple = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20).setHealth(30F)			.setUnlocalizedName("mp_thruster_20_kerosene_triple");
+		mp_thruster_20_solid = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20).setHealth(35F).setWittyText("It's basically just a big hole at the end of the fuel tank.").setUnlocalizedName("mp_thruster_20_solid");
+		mp_thruster_20_solid_multi = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20).setHealth(35F)					.setUnlocalizedName("mp_thruster_20_solid_multi");
+		mp_thruster_20_solid_multier = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20).setHealth(35F).setWittyText("Did I miscount? Hope not.").setUnlocalizedName("mp_thruster_20_solid_multier");
 		
 		mp_stability_10_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_10).setHealth(10F)											.setUnlocalizedName("mp_stability_10_flat");
 		mp_stability_10_cruise = new ItemMissile().makeStability(0.25F, PartSize.SIZE_10).setHealth(5F)											.setUnlocalizedName("mp_stability_10_cruise");
@@ -2558,7 +2558,7 @@ public class ModItems {
 		mp_fuselage_10_long_kerosene_insulation = 	((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Orange Insulation").setHealth(35F).setUnlocalizedName("mp_fuselage_10_long_kerosene_insulation");
 		mp_fuselage_10_long_kerosene_sleek =		((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.RARE).setTitle("IF-R&D").setHealth(40F).setUnlocalizedName("mp_fuselage_10_long_kerosene_sleek");
 		mp_fuselage_10_long_kerosene_metal = 		((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Hoboy").setHealth(35F).setUnlocalizedName("mp_fuselage_10_long_kerosene_metal");
-		mp_fuselage_10_long_kerosene_dash = 		((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("Sam").setTitle("Dash").setWittyText("I wash my hands of it.").setUnlocalizedName("mp_fuselage_10_long_kerosene_dash");
+		mp_fuselage_10_long_kerosene_dash = 		((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("Sam").setTitle("Dash").setWittyText("I wash my hands of it.").setCreativeTab(null).setUnlocalizedName("mp_fuselage_10_long_kerosene_dash");
 		mp_fuselage_10_long_kerosene_taint = 		((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Sam").setTitle("Tainted").setUnlocalizedName("mp_fuselage_10_long_kerosene_taint");
 		mp_fuselage_10_long_kerosene_vap = 			((ItemMissile) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("VT-6/24").setTitle("Minty Contrail").setWittyText("Upper rivet!").setUnlocalizedName("mp_fuselage_10_long_kerosene_vap");
 		
@@ -2587,7 +2587,7 @@ public class ModItems {
 		mp_fuselage_15_kerosene_blackjack = 	((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.LEGENDARY).setTitle("Queen Whiskey").setHealth(100F).setUnlocalizedName("mp_fuselage_15_kerosene_blackjack");
 		mp_fuselage_15_kerosene_lambda = 		((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.RARE).setAuthor("VT-6/24").setTitle("Lambda Complex").setHealth(75F).setWittyText("MAGNIFICENT MICROWAVE CASSEROLE").setUnlocalizedName("mp_fuselage_15_kerosene_lambda");
 		mp_fuselage_15_kerosene_minuteman = 	((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Spexta").setTitle("MX 1702").setUnlocalizedName("mp_fuselage_15_kerosene_minuteman");
-		mp_fuselage_15_kerosene_pip = 			((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("The Doctor").setTitle("LittlePip").setWittyText("31!").setUnlocalizedName("mp_fuselage_15_kerosene_pip");
+		mp_fuselage_15_kerosene_pip = 			((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("The Doctor").setTitle("LittlePip").setWittyText("31!").setCreativeTab(null).setUnlocalizedName("mp_fuselage_15_kerosene_pip");
 		mp_fuselage_15_kerosene_taint = 		((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Sam").setTitle("Tainted").setWittyText("DUN-DUN!").setUnlocalizedName("mp_fuselage_15_kerosene_taint");
 		mp_fuselage_15_kerosene_yuck = 			((ItemMissile) mp_fuselage_15_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("Hoboy").setTitle("Flesh").setWittyText("Note: Never clean DNA vials with your own spit.").setHealth(60F).setUnlocalizedName("mp_fuselage_15_kerosene_yuck");
 		
@@ -3127,7 +3127,7 @@ public class ModItems {
 		bobmazon_machines = new ItemCatalog().setUnlocalizedName("bobmazon_machines").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":bobmazon_machines");
 		bobmazon_weapons = new ItemCatalog().setUnlocalizedName("bobmazon_weapons").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":bobmazon_weapons");
 		bobmazon_tools = new ItemCatalog().setUnlocalizedName("bobmazon_tools").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":bobmazon_tools");
-		bobmazon_hidden = new ItemCatalog().setUnlocalizedName("bobmazon_hidden").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":bobmazon_special");
+		bobmazon_hidden = new ItemCatalog().setUnlocalizedName("bobmazon_hidden").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":bobmazon_special");
 
 		euphemium_helmet = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet");
 		euphemium_plate = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate");
diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java
index aefcefad0..d552f8626 100644
--- a/com/hbm/items/tool/ItemAssemblyTemplate.java
+++ b/com/hbm/items/tool/ItemAssemblyTemplate.java
@@ -425,6 +425,18 @@ public class ItemAssemblyTemplate extends Item {
 				new ItemStack(ModItems.ingot_dura_steel, 16),
 				new ItemStack(ModItems.plate_steel, 12)),
 				new ItemStack(ModItems.mp_thruster_20_solid)),
+		MP_T_20_SOLID_MULTI(500, Arrays.asList(
+				new ItemStack(ModItems.seg_20, 1),
+				new ItemStack(ModItems.coil_tungsten, 12),
+				new ItemStack(ModItems.ingot_dura_steel, 18),
+				new ItemStack(ModItems.plate_steel, 12)),
+				new ItemStack(ModItems.mp_thruster_20_solid_multi)),
+		MP_T_20_SOLID_MULTIER(500, Arrays.asList(
+				new ItemStack(ModItems.seg_20, 1),
+				new ItemStack(ModItems.coil_tungsten, 16),
+				new ItemStack(ModItems.ingot_dura_steel, 20),
+				new ItemStack(ModItems.plate_steel, 12)),
+				new ItemStack(ModItems.mp_thruster_20_solid_multier)),
 		
 		MP_F_10_KEROSENE(100, Arrays.asList(
 				new ItemStack(ModItems.seg_10, 2),
diff --git a/com/hbm/lib/HbmChestContents.java b/com/hbm/lib/HbmChestContents.java
index bb3b21b59..4debad688 100644
--- a/com/hbm/lib/HbmChestContents.java
+++ b/com/hbm/lib/HbmChestContents.java
@@ -71,6 +71,7 @@ public class HbmChestContents {
 
 	private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[] {
 			new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 1, 1, 1),
+			new WeightedRandomChestContent(ModItems.chlorine_pinwheel, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.circuit_targeting_tier3, 0, 1, 1, 4),
 			new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 2, 3),
 			new WeightedRandomChestContent(ModItems.circuit_targeting_tier4, 0, 1, 1, 2),
diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java
index 417006ca9..e45f2154c 100644
--- a/com/hbm/lib/Library.java
+++ b/com/hbm/lib/Library.java
@@ -31,6 +31,7 @@ import com.hbm.main.MainRegistry;
 import com.hbm.potion.HbmPotion;
 import com.hbm.saveddata.RadEntitySavedData;
 import com.hbm.tileentity.conductor.TileEntityCable;
+import com.hbm.tileentity.conductor.TileEntityCableSwitch;
 import com.hbm.tileentity.conductor.TileEntityFluidDuct;
 import com.hbm.tileentity.conductor.TileEntityGasDuct;
 import com.hbm.tileentity.conductor.TileEntityGasDuctSolid;
@@ -969,6 +970,34 @@ public class Library {
 					((TileEntityWireCoated)tileentity).uoteab.add(new UnionOfTileEntitiesAndBooleans(that, newTact));
 				}
 			}
+			if(tileentity instanceof TileEntityCableSwitch)
+			{
+				if(tileentity.getBlockMetadata() == 1) {
+					if(Library.checkUnionList(((TileEntityCableSwitch)tileentity).uoteab, that))
+					{
+						for(int i = 0; i < ((TileEntityCableSwitch)tileentity).uoteab.size(); i++)
+						{
+							if(((TileEntityCableSwitch)tileentity).uoteab.get(i).source == that)
+							{
+								if(((TileEntityCableSwitch)tileentity).uoteab.get(i).ticked != newTact)
+								{
+									((TileEntityCableSwitch)tileentity).uoteab.get(i).ticked = newTact;
+									that.ffgeua(x, y + 1, z, that.getTact());
+									that.ffgeua(x, y - 1, z, that.getTact());
+									that.ffgeua(x - 1, y, z, that.getTact());
+									that.ffgeua(x + 1, y, z, that.getTact());
+									that.ffgeua(x, y, z - 1, that.getTact());
+									that.ffgeua(x, y, z + 1, that.getTact());
+								}
+							}
+						}
+					} else {
+						((TileEntityCableSwitch)tileentity).uoteab.add(new UnionOfTileEntitiesAndBooleans(that, newTact));
+					}
+				} else {
+					((TileEntityCableSwitch)tileentity).uoteab.clear();
+				}
+			}
 			if(tileentity instanceof TileEntityPylonRedWire)
 			{
 				if(Library.checkUnionList(((TileEntityPylonRedWire)tileentity).uoteab, that))
diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java
index 8e965d00d..dd35b202f 100644
--- a/com/hbm/lib/RefStrings.java
+++ b/com/hbm/lib/RefStrings.java
@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (3152)";
+	public static final String VERSION = "1.0.27 BETA (3165)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version
diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
index 03a42658a..f2586ab3b 100644
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@@ -589,6 +589,7 @@ public class CraftingManager {
 		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_generator), 1), new Object[] { "SLS", "LCL", "SLS", 'C', ModItems.circuit_red_copper, 'L', ModItems.rod_quad_lead, 'S', "ingotSteel" }));
 		//GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_industrial_generator), 1), new Object[] { "PPP", "FGG", "WSS", 'P', ModItems.board_copper, 'F', ModItems.generator_front, 'G', ModItems.generator_steel, 'W', ModBlocks.red_wire_coated, 'S', ModItems.pedestal_steel });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_wire_coated), 16), new Object[] { "WRW", "RIR", "WRW", 'W', ModItems.plate_polymer, 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper }));
+		GameRegistry.addRecipe(new ItemStack(ModBlocks.cable_switch, 1), new Object[] { "S", "W", 'S', Blocks.lever, 'W', ModBlocks.red_wire_coated });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_cable), 16), new Object[] { " W ", "RRR", " W ", 'W', ModItems.plate_polymer, 'R', ModItems.wire_red_copper });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_pylon), 4), new Object[] { "CWC", "PWP", " T ", 'C', ModItems.coil_copper_torus, 'W', "plankWood", 'P', ModItems.plate_polymer, 'T', ModBlocks.red_wire_coated }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.oil_duct_solid), 16), new Object[] { "SPS", "P P", "SPS", 'S', "ingotSteel", 'P', "plateIron" }));
diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java
index 0b6cab291..91cc3ee1d 100644
--- a/com/hbm/main/MainRegistry.java
+++ b/com/hbm/main/MainRegistry.java
@@ -532,6 +532,7 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityCompactLauncher.class, "tileentity_small_launcher");
 		GameRegistry.registerTileEntity(TileEntityMultiblock.class, "tileentity_multi_core");
 		GameRegistry.registerTileEntity(TileEntityChlorineSeal.class, "tileentity_chlorine_seal");
+		GameRegistry.registerTileEntity(TileEntityCableSwitch.class, "tileentity_he_switch");
 
 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
diff --git a/com/hbm/tileentity/conductor/TileEntityCableSwitch.java b/com/hbm/tileentity/conductor/TileEntityCableSwitch.java
new file mode 100644
index 000000000..6af382b7b
--- /dev/null
+++ b/com/hbm/tileentity/conductor/TileEntityCableSwitch.java
@@ -0,0 +1,9 @@
+package com.hbm.tileentity.conductor;
+
+import com.hbm.interfaces.IConductor;
+
+import net.minecraft.tileentity.TileEntity;
+
+public class TileEntityCableSwitch extends TileEntityWireCoated {
+
+}
diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
index 4d2456972..7a5db9a85 100644
--- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
+++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
@@ -326,6 +326,9 @@ public class TileEntityMachineReactorSmall extends TileEntity
 			}
 		}
 		
+		if(rodMax == 0)
+			return 0;
+		
 		return rod * 100 / rodMax;
 	}