BuildCraft 7.1.20

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.1.19"
+version = "7.1.20"
 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.1.20

@@ -0,0 +1,6 @@
+Bugs fixed:
+
+* [#3492] Remove wasted space in packets (asie)
+* [#3488] Fix Zone Planner crash in fullscreen mode (asie)
+* [#3429] Fix robots sinking through bedrock if the docking station is broken (asie)
+* [#3341] Fix builder not handling flowing liquid correctly in survival mode (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.1.19
+1.7.10:BuildCraft:7.1.20

common/buildcraft/BuildCraftBuilders.java

@@ -14,7 +14,6 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.List;
 
-import buildcraft.api.blueprints.*;
 import com.google.common.collect.Lists;
 
 import net.minecraft.block.Block;
@@ -55,6 +54,14 @@ import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Property;
 
+import buildcraft.api.blueprints.BlueprintDeployer;
+import buildcraft.api.blueprints.BuilderAPI;
+import buildcraft.api.blueprints.ISchematicRegistry;
+import buildcraft.api.blueprints.SchematicBlock;
+import buildcraft.api.blueprints.SchematicEntity;
+import buildcraft.api.blueprints.SchematicFactory;
+import buildcraft.api.blueprints.SchematicMask;
+import buildcraft.api.blueprints.SchematicTile;
 import buildcraft.api.core.JavaTools;
 import buildcraft.api.library.LibraryAPI;
 import buildcraft.api.statements.StatementManager;
@@ -134,8 +141,6 @@ import buildcraft.core.builders.schematics.SchematicRotateMeta;
 import buildcraft.core.builders.schematics.SchematicRotateMetaSupported;
 import buildcraft.core.builders.schematics.SchematicTileCreative;
 import buildcraft.core.config.ConfigManager;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
 
 @Mod(name = "BuildCraft Builders", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Builders", dependencies = DefaultProps.DEPENDENCY_CORE)
 public class BuildCraftBuilders extends BuildCraftMod {

common/buildcraft/builders/HeuristicBlockDetection.java

@@ -2,23 +2,29 @@ package buildcraft.builders;
 
 import java.util.Iterator;
 
-import buildcraft.api.blueprints.Schematic;
+import net.minecraft.block.Block;
-import buildcraft.core.builders.schematics.SchematicIgnore;
+import net.minecraft.block.BlockBasePressurePlate;
-import buildcraft.core.lib.utils.FluidUtils;
+import net.minecraft.block.BlockBush;
-import net.minecraft.block.*;
+import net.minecraft.block.BlockButton;
+import net.minecraft.block.BlockDynamicLiquid;
+import net.minecraft.block.BlockLever;
+import net.minecraft.block.BlockStairs;
+import net.minecraft.block.BlockTorch;
+import net.minecraft.block.IGrowable;
 import net.minecraft.init.Blocks;
 
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidBlock;
 
 import buildcraft.api.blueprints.SchematicBlock;
 import buildcraft.api.blueprints.SchematicFluid;
 import buildcraft.builders.schematics.SchematicStairs;
 import buildcraft.core.blueprints.SchematicRegistry;
 import buildcraft.core.builders.schematics.SchematicBlockFloored;
+import buildcraft.core.builders.schematics.SchematicIgnore;
 import buildcraft.core.builders.schematics.SchematicTileCreative;
 import buildcraft.core.builders.schematics.SchematicWallSide;
+import buildcraft.core.lib.utils.FluidUtils;
 
 public final class HeuristicBlockDetection {
 	private HeuristicBlockDetection() {

common/buildcraft/robotics/DockingStationPipe.java

@@ -209,7 +209,8 @@ public class DockingStationPipe extends DockingStation implements IRequestProvid
 
 	@Override
 	public boolean isInitialized() {
-		IPipeTile pipe = getPipe();
+		getPipe();
+
 		if (pipe == null || pipe.getPipe() == null) {
 			return false;
 		}
@@ -218,9 +219,10 @@ public class DockingStationPipe extends DockingStation implements IRequestProvid
 
 	@Override
 	public boolean take(EntityRobotBase robot) {
-		IPipeTile pipe = getPipe();
+		getPipe();
-		if (pipe == null)
+		if (pipe == null) {
 			return false;
+		}
 
 		boolean result = super.take(robot);
 		if (result) {
@@ -231,9 +233,10 @@ public class DockingStationPipe extends DockingStation implements IRequestProvid
 
 	@Override
 	public boolean takeAsMain(EntityRobotBase robot) {
-		IPipeTile pipe = getPipe();
+		getPipe();
-		if (pipe == null)
+		if (pipe == null) {
 			return false;
+		}
 
 		boolean result = super.takeAsMain(robot);
 		if (result) {

common/buildcraft/robotics/gui/GuiZonePlan.java

@@ -11,7 +11,6 @@ package buildcraft.robotics.gui;
 import java.util.LinkedList;
 import java.util.List;
 
-import net.minecraft.inventory.Slot;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -20,6 +19,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
@@ -321,8 +321,9 @@ public class GuiZonePlan extends GuiAdvancedInterface {
 	}
 
 	private void toFullscreen() {
-		if (isFullscreen())
+		if (isFullscreen()) {
 			return;
+		}
 
 		if (blocksPerPixel > 4.0f) {
 			blocksPerPixel = 4.0f;
@@ -346,8 +347,9 @@ public class GuiZonePlan extends GuiAdvancedInterface {
 	}
 
 	private void toWindowed() {
-		if (!isFullscreen())
+		if (!isFullscreen()) {
 			return;
+		}
 
 		mapWidth = WINDOWED_MAP_WIDTH;
 		mapHeight = WINDOWED_MAP_HEIGHT;