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

BuildCraft 7.0.3

Browse source
This commit is contained in:
asiekierka 2015-05-02 15:35:47 +02:00
parent 89160d017a
commit 36387f533f
8 changed files with 8 additions and 15 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.0.2"
version = "7.0.3"
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]

1
common/buildcraft/core/CompatHooks.java
View file

@ -13,7 +13,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.common.Loader;
import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyHandler;
import buildcraft.api.transport.IInjectable;
public class CompatHooks {

2
common/buildcraft/core/lib/block/BlockBuildCraft.java
View file

@ -16,7 +16,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
@ -30,7 +29,6 @@ import buildcraft.BuildCraftCore;
import buildcraft.api.events.BlockInteractionEvent;
import buildcraft.api.events.BlockPlacedDownEvent;
import buildcraft.api.tiles.IHasWork;
import buildcraft.api.tools.IToolWrench;
import buildcraft.core.BCCreativeTab;
import buildcraft.core.lib.utils.ResourceUtils;
import buildcraft.core.lib.utils.Utils;

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

@ -16,7 +16,6 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.client.Minecraft;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;

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

@ -98,7 +98,7 @@ public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem {
}
int energy = NBTUtils.getItemData(stack).getInteger("energy");
int pct = (energy * 100 / EntityRobotBase.MAX_ENERGY);
int pct = energy * 100 / EntityRobotBase.MAX_ENERGY;
String enInfo = pct + "% Charged";
if (energy == EntityRobotBase.MAX_ENERGY) {
enInfo = "Full Charge";

2
common/buildcraft/robotics/boards/BoardRobotPicker.java
View file

@ -10,7 +10,6 @@ package buildcraft.robotics.boards;
import java.util.HashSet;
import java.util.Set;
import net.minecraft.nbt.NBTTagCompound;
import buildcraft.api.boards.RedstoneBoardRobot;
import buildcraft.api.boards.RedstoneBoardRobotNBT;
import buildcraft.api.robots.AIRobot;
@ -21,7 +20,6 @@ import buildcraft.robotics.ai.AIRobotGotoStationAndUnload;
import buildcraft.robotics.statements.ActionRobotFilter;
public class BoardRobotPicker extends RedstoneBoardRobot {
// TODO: Clean this when world unloaded
public static Set<Integer> targettedItems = new HashSet<Integer>();

8
common/buildcraft/transport/PipeTransportPower.java
View file

@ -44,13 +44,10 @@ import buildcraft.transport.pipes.PipePowerWood;
public class PipeTransportPower extends PipeTransport implements IDebuggable {
public static final Map<Class<? extends Pipe<?>>, Integer> powerCapacities = new HashMap<Class<? extends Pipe<?>>, Integer>();
private static final int DISPLAY_SMOOTHING = 10;
private static final int OVERLOAD_TICKS = 60;
private final TileEntity[] tiles = new TileEntity[6];
private final Object[] providers = new Object[6];
public short[] displayPower = new short[6];
public int[] nextPowerQuery = new int[6];
public int[] internalNextPower = new int[6];
@ -61,6 +58,9 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable {
public int[] dbgEnergyOutput = new int[6];
public int[] dbgEnergyOffered = new int[6];
private final TileEntity[] tiles = new TileEntity[6];
private final Object[] providers = new Object[6];
private boolean needsInit = true;
private short[] prevDisplayPower = new short[6];

5
common/buildcraft/transport/gui/GuiGateInterface.java
View file

@ -9,7 +9,6 @@
package buildcraft.transport.gui;
import java.util.Iterator;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import net.minecraft.inventory.IInventory;
@ -284,7 +283,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
} else {
Iterator<IStatement> it = container.getTriggerIterator(k != 0);
for (; it.hasNext(); ) {
for (; it.hasNext();) {
IStatement trigger = it.next();
if (!it.hasNext()) {
@ -331,7 +330,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
} else {
Iterator<IStatement> it = container.getActionIterator(k != 0);
for (; it.hasNext(); ) {
for (; it.hasNext();) {
IStatement action = it.next();
if (!it.hasNext()) {