fix #3000, fix #2978, fix #2977, fix #2526, add changelog

build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
 apply plugin: 'maven' // for uploading to a maven repo
 apply plugin: 'checkstyle'
 
-version = "7.0.21"
+version = "7.0.22"
 group= "com.mod-buildcraft"
 archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
 

buildcraft_resources/changelog/7.0.22

@@ -0,0 +1,11 @@
+Bugs fixed:
+
+* [#3000] Robots only charge to 20% when "go to home" is true (hea3ven, asie)
+* [#2996] DockingStationPipe crash (asie)
+* [#2994] Dupe with just about anything that mines (asie)
+* [#2984] List sorting crash with flowers (asie)
+* [#2978] Programming Table refusing to work after item removal (asie)
+* [#2977, #2526] Assembly Table voiding excess energy (just made it not void it after all) (asie)
+* [#2971] Stamping Table overflow on multiple-output items (asie)
+* [#2969] Crash when Silicon present without Transport (asie)
+* [#2964] Fluid/laser textures breaking on texture pack change (asie)

buildcraft_resources/versions.txt

@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:7.0.21
+1.7.10:BuildCraft:7.0.22

common/buildcraft/robotics/ai/AIRobotMain.java

@@ -41,8 +41,10 @@ public class AIRobotMain extends AIRobot {
 					startDelegateAI(new AIRobotRecharge(robot));
 				}
 			}
-		} else if (overridingAI != null && ai != overridingAI) {
-			startDelegateAI(overridingAI);
+		} else if (!(ai instanceof AIRobotRecharge)) {
+			if (overridingAI != null && ai != overridingAI) {
+				startDelegateAI(overridingAI);
+			}
 		}
 	}
 

common/buildcraft/silicon/TileAssemblyTable.java

@@ -77,6 +77,9 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
 		}
 
 		if (currentRecipe == null) {
+			/* if (getEnergy() >= 50) {
+				setEnergy(Math.max(0, getEnergy() - 50));
+			} */
 			return;
 		}
 
@@ -89,10 +92,10 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
 		}
 
 		if (getEnergy() >= currentRecipe.craft(this, true).energyCost) {
-			setEnergy(0);
-
 			if (currentRecipe.canBeCrafted(this)) {
-				outputStack(currentRecipe.craft(this, false).crafted.copy(), true);
+				CraftingResult<ItemStack> result = currentRecipe.craft(this, false);
+				setEnergy(Math.max(0, getEnergy() - result.energyCost));
+				outputStack(result.crafted.copy(), true);
 
 				setNextCurrentRecipe();
 			}

common/buildcraft/silicon/TileProgrammingTable.java

@@ -102,7 +102,7 @@ public class TileProgrammingTable extends TileLaserTableBase implements IInvento
 	public void readData(ByteBuf stream) {
 		super.readData(stream);
 		currentRecipeId = NetworkUtils.readUTF(stream);
-		optionId = stream.readUnsignedByte();
+		optionId = stream.readByte();
 		updateRecipe();
 	}
 
@@ -158,7 +158,7 @@ public class TileProgrammingTable extends TileLaserTableBase implements IInvento
 			}
 		}
 
-		if ((oldId != null && currentRecipeId != null &&  !oldId.equals(currentRecipeId))
+		if ((oldId != null && currentRecipeId != null && !oldId.equals(currentRecipeId))
 				|| (oldId == null && currentRecipeId != null)
 				|| (oldId != null && currentRecipeId == null)) {
 			optionId = -1;
@@ -187,9 +187,11 @@ public class TileProgrammingTable extends TileLaserTableBase implements IInvento
 	@Override
 	public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
 		if (side.isServer() && "select".equals(command)) {
-			optionId = stream.readUnsignedByte();
+			optionId = stream.readByte();
 			if (optionId >= options.size()) {
-				optionId = 0;
+				optionId = -1;
+			} else if (optionId < -1) {
+				optionId = -1;
 			}
 
 			queueNetworkUpdate();

common/buildcraft/silicon/gui/GuiProgrammingTable.java

@@ -168,7 +168,11 @@ public class GuiProgrammingTable extends GuiAdvancedInterface {
 				return;
 			}
 
-			table.rpcSelectOption(slot.id);
+			if (table.optionId == slot.id) {
+				table.rpcSelectOption(-1);
+			} else {
+				table.rpcSelectOption(slot.id);
+			}
 		}
 	}