BuildCraft 6.2.5

This commit is contained in:
asiekierka 2014-12-14 17:03:02 +01:00
parent 279372f672
commit 87fffc2456
11 changed files with 39 additions and 23 deletions

View file

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

View file

@ -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)

View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2 1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16 1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:6.2.4 1.7.10:BuildCraft:6.2.5

View file

@ -13,7 +13,11 @@ import cpw.mods.fml.common.Loader;
import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.BlockGenericPipe;
import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TileGenericPipe;
public class BCCompatHooks { public final class BCCompatHooks {
private BCCompatHooks() {
}
public static BlockGenericPipe createPipeBlock() { public static BlockGenericPipe createPipeBlock() {
BlockGenericPipe genericPipeBlock; BlockGenericPipe genericPipeBlock;

View file

@ -5,8 +5,6 @@ import java.util.Iterator;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidBlock;
import buildcraft.api.blueprints.SchematicBlock; import buildcraft.api.blueprints.SchematicBlock;

View file

@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftBuilders;
import buildcraft.BuildCraftCore;
import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.TileBlueprintLibrary;
import buildcraft.builders.blueprints.BlueprintId; import buildcraft.builders.blueprints.BlueprintId;
import buildcraft.builders.blueprints.BlueprintId.Kind; import buildcraft.builders.blueprints.BlueprintId.Kind;

View file

@ -8,11 +8,6 @@
*/ */
package buildcraft.commander; 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 io.netty.buffer.ByteBuf;
import net.minecraft.block.material.MapColor; import net.minecraft.block.material.MapColor;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

View file

@ -15,7 +15,6 @@ import java.util.HashSet;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
import buildcraft.api.blueprints.ISchematicRegistry; import buildcraft.api.blueprints.ISchematicRegistry;

View file

@ -10,7 +10,6 @@ package buildcraft.core.gui;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -79,11 +78,6 @@ public class GuiList extends GuiAdvancedInterface {
public int kind; public int kind;
private String desc; private String desc;
@Override
public String getDescription() {
return desc;
}
public Button(GuiAdvancedInterface gui, int x, int y, int iLine, int iKind, String iDesc) { public Button(GuiAdvancedInterface gui, int x, int y, int iLine, int iKind, String iDesc) {
super(gui, x, y); super(gui, x, y);
@ -92,6 +86,10 @@ public class GuiList extends GuiAdvancedInterface {
desc = iDesc; desc = iDesc;
} }
@Override
public String getDescription() {
return desc;
}
} }
public GuiList(EntityPlayer iPlayer) { public GuiList(EntityPlayer iPlayer) {
@ -176,7 +174,7 @@ public class GuiList extends GuiAdvancedInterface {
private boolean isCarryingList() { private boolean isCarryingList() {
ItemStack stack = mc.thePlayer.inventory.getItemStack(); 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 @Override

View file

@ -158,8 +158,8 @@ public class BlockTank extends BlockBuildCraft {
IFluidContainerItem container = (IFluidContainerItem) current.getItem(); IFluidContainerItem container = (IFluidContainerItem) current.getItem();
FluidStack liquid = container.getFluid(current); FluidStack liquid = container.getFluid(current);
FluidStack tankLiquid = tank.getTankInfo(ForgeDirection.UNKNOWN)[0].fluid; FluidStack tankLiquid = tank.getTankInfo(ForgeDirection.UNKNOWN)[0].fluid;
boolean mustDrain = (liquid == null || liquid.amount == 0); boolean mustDrain = liquid == null || liquid.amount == 0;
boolean mustFill = (tankLiquid == null || tankLiquid.amount == 0); boolean mustFill = tankLiquid == null || tankLiquid.amount == 0;
if (mustDrain && mustFill) { if (mustDrain && mustFill) {
// Both are empty, do nothing // Both are empty, do nothing
} else if (mustDrain || !entityplayer.isSneaking()) { } else if (mustDrain || !entityplayer.isSneaking()) {

View file

@ -53,7 +53,6 @@ import buildcraft.core.network.IGuiReturnHandler;
import buildcraft.core.network.ISyncedTile; import buildcraft.core.network.ISyncedTile;
import buildcraft.core.network.PacketTileState; import buildcraft.core.network.PacketTileState;
import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.DockingStation;
import buildcraft.core.utils.ColorUtils;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import buildcraft.transport.ItemFacade.FacadeState; import buildcraft.transport.ItemFacade.FacadeState;
import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.GateFactory;
@ -427,7 +426,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler,
} }
public int getItemMetadata() { public int getItemMetadata() {
return (getColor() >= 0 ? (1 + getColor()) : 0); return getColor() >= 0 ? (1 + getColor()) : 0;
} }
public int getColor() { public int getColor() {