Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BuildCraft 7.1.12

Browse source
This commit is contained in:
asiekierka 2015-10-25 11:36:51 +01:00
parent 728da1fc38
commit d32e50c16d
10 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -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.11"
version = "7.1.12"
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]

2
buildcraft_resources/changelog/7.1.12
View file

@ -16,4 +16,4 @@ Bugs fixed:
* [#3089] Integration Table dupe (asie)
* [#3082] Void not killing robots (asie)
* [#3081] Emzuli Pipe behaviour bug (asie)
* Robot crash with TConstruct pickaxe on world reload (asie)

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:7.1.11
1.7.10:BuildCraft:7.1.12

11
common/buildcraft/core/lib/utils/BlockUtils.java
View file

@ -97,6 +97,9 @@ public final class BlockUtils {
return false;
}
Block block = world.getBlock(x, y, z);
int meta = world.getBlockMetadata(x, y, z);
EntityPlayer player = CoreProxy.proxy.getBuildCraftPlayer(world, x, y, z).get();
int i = 0;
while (player.getHeldItem() != tool && i < 9) {
@ -107,7 +110,13 @@ public final class BlockUtils {
player.inventory.setInventorySlotContents(i, tool);
i++;
}
world.getBlock(x, y, z).harvestBlock(world, player, x, y, z, world.getBlockMetadata(x, y, z));
if (!block.canHarvestBlock(player, meta)) {
return false;
}
block.onBlockHarvested(world, x, y, z, meta, player);
block.harvestBlock(world, player, x, y, z, meta);
world.setBlockToAir(x, y, z);
return true;

3
common/buildcraft/core/proxy/CoreProxy.java
View file

@ -9,10 +9,7 @@
package buildcraft.core.proxy;
import java.lang.ref.WeakReference;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

5
common/buildcraft/core/proxy/CoreProxyClient.java
View file

@ -8,15 +8,10 @@
*/
package buildcraft.core.proxy;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;

2
common/buildcraft/robotics/EntityRobot.java
View file

@ -18,7 +18,6 @@ import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
@ -69,7 +68,6 @@ import buildcraft.api.boards.RedstoneBoardRobot;
import buildcraft.api.boards.RedstoneBoardRobotNBT;
import buildcraft.api.core.BCLog;
import buildcraft.api.core.BlockIndex;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.core.IZone;
import buildcraft.api.core.SafeTimeTracker;
import buildcraft.api.events.RobotEvent;

1
common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java
View file

@ -17,7 +17,6 @@ import buildcraft.robotics.ai.AIRobotBreak;
import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack;
import buildcraft.robotics.ai.AIRobotGotoSleep;
import buildcraft.robotics.ai.AIRobotGotoStationAndUnload;
import buildcraft.robotics.ai.AIRobotUnload;
public abstract class BoardRobotGenericBreakBlock extends BoardRobotGenericSearchBlock {

1
common/buildcraft/robotics/boards/BoardRobotMiner.java
View file

@ -8,7 +8,6 @@
*/
package buildcraft.robotics.boards;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

4
common/buildcraft/silicon/TileIntegrationTable.java
View file

@ -27,10 +27,12 @@ import buildcraft.core.lib.utils.Utils;
public class TileIntegrationTable extends TileLaserTableBase implements ISidedInventory {
public static final int SLOT_OUTPUT = 9;
public final IInventory clientOutputInv = new SimpleInventory(1, "Preview", 64);
private static final int CYCLE_LENGTH = 16;
private static final int[] SLOTS = Utils.createSlotArray(0, 10);
public final IInventory clientOutputInv = new SimpleInventory(1, "Preview", 64);
private int tick = 0;
private IIntegrationRecipe activeRecipe;
private boolean activeRecipeValid = false;