diff --git a/build.gradle b/build.gradle index 87762012..3428b8c5 100755 --- a/build.gradle +++ b/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 = "6.2.4" +version = "6.2.5" 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] diff --git a/buildcraft_resources/changelog/6.2.5 b/buildcraft_resources/changelog/6.2.5 new file mode 100644 index 00000000..bffff51f --- /dev/null +++ b/buildcraft_resources/changelog/6.2.5 @@ -0,0 +1,24 @@ +Additions: +* [#2288] Heavily optimized Zone Planners (both in CPU and network usage) (asie) +* [#2270] Blueprint Libraries now refresh on GUI open (asie) +* Pipes can now be colored with any tool implementing the Forge recolourBlock API, for example IC2 Painters or AE2 Color Applicators (asie) +* Pipes can now have their color bleached with a water bucket (asie) +* List buttons now have descriptive tooltips (asie) +* Huge improvements to Robot rendering, especially at night (ganymedes01) +* Translation updates: German (Vexatos), Slovak (leSamo) + +Bugfixes: +* [#2298] Lists do not save settings (asie) +* [#2295] The Tank runs the onBlockActivated() also on the client side (asie) +* [#2289] Blueprints over ~32k do not work (asie) +* [#2243] Builder excavation broken (asie) +* Fluid blocks not autodetected correctly by Builder (asie) +* IFluidContainerItem logic broken (asie) +* Invalid coordinates for FakePlayers (asie) +* Mining Well, Quarry and Spring sounds not restored since 4.2.2 (asie) +* Minor blueprint bug (asie) + +Misc: +* Better color choice for Blueprint Library GUI (asie) +* Further preparations for BuildCraftCompat (asie) +* More detailed builder error messages (asie) diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt index 9971fd5f..44734993 100755 --- a/buildcraft_resources/versions.txt +++ b/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:6.2.4 +1.7.10:BuildCraft:6.2.5 diff --git a/common/buildcraft/BCCompatHooks.java b/common/buildcraft/BCCompatHooks.java index 453d494c..ae3b683a 100644 --- a/common/buildcraft/BCCompatHooks.java +++ b/common/buildcraft/BCCompatHooks.java @@ -13,7 +13,11 @@ import cpw.mods.fml.common.Loader; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.TileGenericPipe; -public class BCCompatHooks { +public final class BCCompatHooks { + private BCCompatHooks() { + + } + public static BlockGenericPipe createPipeBlock() { BlockGenericPipe genericPipeBlock; diff --git a/common/buildcraft/builders/HeuristicBlockDetection.java b/common/buildcraft/builders/HeuristicBlockDetection.java index db1a8c88..6acba8ee 100644 --- a/common/buildcraft/builders/HeuristicBlockDetection.java +++ b/common/buildcraft/builders/HeuristicBlockDetection.java @@ -5,8 +5,6 @@ import java.util.Iterator; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index 993c8ff3..b79369ef 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftBuilders; -import buildcraft.BuildCraftCore; import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.blueprints.BlueprintId; import buildcraft.builders.blueprints.BlueprintId.Kind; diff --git a/common/buildcraft/commander/ContainerZonePlan.java b/common/buildcraft/commander/ContainerZonePlan.java index 3fe56482..0ba49dce 100755 --- a/common/buildcraft/commander/ContainerZonePlan.java +++ b/common/buildcraft/commander/ContainerZonePlan.java @@ -8,11 +8,6 @@ */ package buildcraft.commander; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.IntBuffer; -import java.util.zip.Deflater; -import java.util.zip.Inflater; import io.netty.buffer.ByteBuf; import net.minecraft.block.material.MapColor; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/buildcraft/core/blueprints/SchematicRegistry.java b/common/buildcraft/core/blueprints/SchematicRegistry.java index 521b5a07..45e72692 100644 --- a/common/buildcraft/core/blueprints/SchematicRegistry.java +++ b/common/buildcraft/core/blueprints/SchematicRegistry.java @@ -15,7 +15,6 @@ import java.util.HashSet; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import buildcraft.api.blueprints.ISchematicRegistry; diff --git a/common/buildcraft/core/gui/GuiList.java b/common/buildcraft/core/gui/GuiList.java index ad6da86b..1a36b363 100755 --- a/common/buildcraft/core/gui/GuiList.java +++ b/common/buildcraft/core/gui/GuiList.java @@ -10,7 +10,6 @@ package buildcraft.core.gui; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -79,11 +78,6 @@ public class GuiList extends GuiAdvancedInterface { public int kind; private String desc; - @Override - public String getDescription() { - return desc; - } - public Button(GuiAdvancedInterface gui, int x, int y, int iLine, int iKind, String iDesc) { super(gui, x, y); @@ -92,6 +86,10 @@ public class GuiList extends GuiAdvancedInterface { desc = iDesc; } + @Override + public String getDescription() { + return desc; + } } public GuiList(EntityPlayer iPlayer) { @@ -176,7 +174,7 @@ public class GuiList extends GuiAdvancedInterface { private boolean isCarryingList() { ItemStack stack = mc.thePlayer.inventory.getItemStack(); - return (stack != null && stack.getItem() != null && stack.getItem() instanceof ItemList); + return stack != null && stack.getItem() != null && stack.getItem() instanceof ItemList; } @Override diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 2214befe..5ca3ddb4 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -158,8 +158,8 @@ public class BlockTank extends BlockBuildCraft { IFluidContainerItem container = (IFluidContainerItem) current.getItem(); FluidStack liquid = container.getFluid(current); FluidStack tankLiquid = tank.getTankInfo(ForgeDirection.UNKNOWN)[0].fluid; - boolean mustDrain = (liquid == null || liquid.amount == 0); - boolean mustFill = (tankLiquid == null || tankLiquid.amount == 0); + boolean mustDrain = liquid == null || liquid.amount == 0; + boolean mustFill = tankLiquid == null || tankLiquid.amount == 0; if (mustDrain && mustFill) { // Both are empty, do nothing } else if (mustDrain || !entityplayer.isSneaking()) { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 55793e9e..71dd0980 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -53,7 +53,6 @@ import buildcraft.core.network.IGuiReturnHandler; import buildcraft.core.network.ISyncedTile; import buildcraft.core.network.PacketTileState; import buildcraft.core.robots.DockingStation; -import buildcraft.core.utils.ColorUtils; import buildcraft.core.utils.Utils; import buildcraft.transport.ItemFacade.FacadeState; import buildcraft.transport.gates.GateFactory; @@ -427,7 +426,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, } public int getItemMetadata() { - return (getColor() >= 0 ? (1 + getColor()) : 0); + return getColor() >= 0 ? (1 + getColor()) : 0; } public int getColor() {