fix checkStyle
This commit is contained in:
parent
954d428813
commit
99369a106b
54 changed files with 212 additions and 136 deletions
|
@ -8,10 +8,7 @@
|
|||
*/
|
||||
package buildcraft.api.core;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.network.Packet;
|
||||
|
||||
public interface ISerializable {
|
||||
void readData(ByteBuf stream);
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
package buildcraft;
|
||||
|
||||
import buildcraft.silicon.*;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
|
@ -57,7 +56,19 @@ import buildcraft.core.robots.boards.BoardRobotPickerNBT;
|
|||
import buildcraft.core.robots.boards.BoardRobotPlanterNBT;
|
||||
import buildcraft.core.robots.boards.BoardRobotPumpNBT;
|
||||
import buildcraft.core.robots.boards.BoardRobotShovelmanNBT;
|
||||
import buildcraft.silicon.BlockLaser;
|
||||
import buildcraft.silicon.BlockLaserTable;
|
||||
import buildcraft.silicon.GuiHandler;
|
||||
import buildcraft.silicon.ItemLaserTable;
|
||||
import buildcraft.silicon.ItemRedstoneBoard;
|
||||
import buildcraft.silicon.ItemRedstoneChipset;
|
||||
import buildcraft.silicon.ItemRedstoneChipset.Chipset;
|
||||
import buildcraft.silicon.SiliconProxy;
|
||||
import buildcraft.silicon.TileAdvancedCraftingTable;
|
||||
import buildcraft.silicon.TileAssemblyTable;
|
||||
import buildcraft.silicon.TileChargingTable;
|
||||
import buildcraft.silicon.TileIntegrationTable;
|
||||
import buildcraft.silicon.TileLaser;
|
||||
import buildcraft.silicon.boards.BoardRecipe;
|
||||
import buildcraft.silicon.boards.ImplRedstoneBoardRegistry;
|
||||
import buildcraft.silicon.network.PacketHandlerSilicon;
|
||||
|
|
|
@ -13,7 +13,6 @@ import java.util.ArrayList;
|
|||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import buildcraft.transport.pipes.PipeFluidsDiamond;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
|
@ -33,7 +32,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
|||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.RecipeSorter;
|
||||
import buildcraft.api.blueprints.BuilderAPI;
|
||||
import buildcraft.api.core.EnumColor;
|
||||
|
@ -82,6 +80,7 @@ import buildcraft.transport.gates.GateExpansionTimer;
|
|||
import buildcraft.transport.gates.ItemGate;
|
||||
import buildcraft.transport.network.PacketHandlerTransport;
|
||||
import buildcraft.transport.pipes.PipeFluidsCobblestone;
|
||||
import buildcraft.transport.pipes.PipeFluidsDiamond;
|
||||
import buildcraft.transport.pipes.PipeFluidsEmerald;
|
||||
import buildcraft.transport.pipes.PipeFluidsGold;
|
||||
import buildcraft.transport.pipes.PipeFluidsIron;
|
||||
|
|
|
@ -289,13 +289,13 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
|
|||
}
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (command.equals("setName")) {
|
||||
if ("setName".equals(command)) {
|
||||
this.name = Utils.readUTF(stream);
|
||||
if (side.isServer()) {
|
||||
BuildCraftCore.instance.sendToPlayersNear(getPacketSetName(), this);
|
||||
}
|
||||
} else if (side.isServer()) {
|
||||
if (command.equals("setReadConfiguration")) {
|
||||
if ("setReadConfiguration".equals(command)) {
|
||||
readConfiguration.readData(stream);
|
||||
sendNetworkUpdate();
|
||||
}
|
||||
|
|
|
@ -253,7 +253,7 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
|
|||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isClient()) {
|
||||
if (command.equals("requestSelectedBlueprint")) {
|
||||
if ("requestSelectedBlueprint".equals(command)) {
|
||||
if (isOutputConsistent()) {
|
||||
if (selected > -1 && selected < currentPage.size()) {
|
||||
final BlueprintBase bpt = BuildCraftBuilders.clientDB
|
||||
|
@ -270,7 +270,7 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
|
|||
BuildCraftCore.instance.sendToServer(new PacketCommand(this, "uploadNothingToServer", null));
|
||||
}
|
||||
}
|
||||
} else if (command.equals("downloadBlueprintToClient")) {
|
||||
} else if ("downloadBlueprintToClient".equals(command)) {
|
||||
BlueprintId id = new BlueprintId();
|
||||
id.readData(stream);
|
||||
byte[] data = Utils.readByteArray(stream);
|
||||
|
@ -288,12 +288,12 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
|
|||
}
|
||||
}
|
||||
} else if (side.isServer()) {
|
||||
if (command.equals("uploadNothingToServer")) {
|
||||
if ("uploadNothingToServer".equals(command)) {
|
||||
setInventorySlotContents(3, getStackInSlot(2));
|
||||
setInventorySlotContents(2, null);
|
||||
|
||||
downloadingPlayer = null;
|
||||
} else if (command.equals("uploadBlueprintToServer")) {
|
||||
} else if ("uploadBlueprintToServer".equals(command)) {
|
||||
BlueprintId id = new BlueprintId();
|
||||
id.readData(stream);
|
||||
byte[] data = Utils.readByteArray(stream);
|
||||
|
@ -306,7 +306,7 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
|
|||
|
||||
setInventorySlotContents(3, bpt.getStack());
|
||||
setInventorySlotContents(2, null);
|
||||
} catch(Exception e) {
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
|
|
@ -630,10 +630,11 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
super.receiveCommand(command, side, sender, stream);
|
||||
if (side.isClient()) {
|
||||
if (command.equals("clearItemRequirements")) {
|
||||
if ("clearItemRequirements".equals(command)) {
|
||||
requiredToBuild = null;
|
||||
} else if (command.equals("setItemRequirements")) {
|
||||
} else if ("setItemRequirements".equals(command)) {
|
||||
int size = stream.readUnsignedShort();
|
||||
requiredToBuild = new ArrayList<ItemStack>();
|
||||
for (int i = 0; i < size; i++) {
|
||||
|
@ -644,7 +645,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
|
|||
}
|
||||
} else if (side.isServer()) {
|
||||
EntityPlayer player = (EntityPlayer) sender;
|
||||
if (command.equals("eraseFluidTank")) {
|
||||
if ("eraseFluidTank".equals(command)) {
|
||||
int id = stream.readInt();
|
||||
if (id < 0 || id >= fluidTanks.length) {
|
||||
return;
|
||||
|
@ -662,12 +663,13 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
|
|||
return new PacketCommand(this, "setItemRequirements", new CommandWriter() {
|
||||
public void write(ByteBuf data) {
|
||||
data.writeShort(items.size());
|
||||
if (items != null)
|
||||
if (items != null) {
|
||||
for (ItemStack rb : items) {
|
||||
Utils.writeStack(data, rb);
|
||||
data.writeShort(rb.stackSize);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return new PacketCommand(this, "clearItemRequirements", null);
|
||||
|
|
|
@ -22,7 +22,6 @@ import buildcraft.BuildCraftCore;
|
|||
import buildcraft.api.core.Position;
|
||||
import buildcraft.core.Box;
|
||||
import buildcraft.core.Box.Kind;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.IBoxProvider;
|
||||
import buildcraft.core.LaserData;
|
||||
import buildcraft.core.TileBuildCraft;
|
||||
|
@ -200,12 +199,12 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer() && command.equals("uploadBuildersInAction")) {
|
||||
if (side.isServer() && "uploadBuildersInAction".equals(command)) {
|
||||
BuildCraftCore.instance.sendToServer(new PacketCommand(this, "uploadBuildersInAction", null));
|
||||
for (BuildingItem i : buildersInAction) {
|
||||
BuildCraftCore.instance.sendToPlayer((EntityPlayer) sender, createLaunchItemPacket(i));
|
||||
}
|
||||
} else if (side.isClient() && command.equals("launchItem")) {
|
||||
} else if (side.isClient() && "launchItem".equals(command)) {
|
||||
BuildingItem item = new BuildingItem();
|
||||
item.readData(stream);
|
||||
buildersInAction.add(item);
|
||||
|
|
|
@ -285,7 +285,7 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
|
|||
}
|
||||
|
||||
public void rpcSetPatternFromString (final String name) {
|
||||
BuildCraftCore.instance.sendToServer(new PacketCommand(this, "set", new CommandWriter() {
|
||||
BuildCraftCore.instance.sendToServer(new PacketCommand(this, "setPattern", new CommandWriter() {
|
||||
public void write(ByteBuf data) {
|
||||
Utils.writeUTF(data, name);
|
||||
}
|
||||
|
@ -294,7 +294,8 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer() && command.equals("set")) {
|
||||
super.receiveCommand(command, side, sender, stream);
|
||||
if (side.isServer() && "setPattern".equals(command)) {
|
||||
String name = Utils.readUTF(stream);
|
||||
setPattern((FillerPattern) FillerManager.registry.getPattern(name));
|
||||
}
|
||||
|
|
|
@ -21,7 +21,6 @@ import buildcraft.api.core.Position;
|
|||
import buildcraft.core.EntityBlock;
|
||||
import buildcraft.core.LaserKind;
|
||||
import buildcraft.core.TileBuildCraft;
|
||||
import buildcraft.core.network.PacketUpdate;
|
||||
import buildcraft.core.proxy.CoreProxy;
|
||||
import buildcraft.core.utils.Utils;
|
||||
|
||||
|
|
|
@ -97,9 +97,9 @@ public class TileUrbanist extends TileBuildCraft implements IInventory, IBoxesPr
|
|||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
// Non-XYZ commands go here
|
||||
if (side.isClient() && command.equals("setFrameKind")) {
|
||||
if (side.isClient() && "setFrameKind".equals(command)) {
|
||||
setFrameKind(stream.readInt(), stream.readInt());
|
||||
} else if (side.isServer() && command.equals("startFiller")) {
|
||||
} else if (side.isServer() && "startFiller".equals(command)) {
|
||||
String fillerTag = Utils.readUTF(stream);
|
||||
Box box = new Box();
|
||||
box.readData(stream);
|
||||
|
@ -111,13 +111,13 @@ public class TileUrbanist extends TileBuildCraft implements IInventory, IBoxesPr
|
|||
int y = stream.readInt();
|
||||
int z = stream.readInt();
|
||||
|
||||
if (side.isServer() && command.equals("setBlock")) {
|
||||
if (side.isServer() && "setBlock".equals(command)) {
|
||||
worldObj.setBlock(x, y, z, Blocks.brick_block);
|
||||
} else if (side.isServer() && command.equals("eraseBlock")) {
|
||||
} else if (side.isServer() && "eraseBlock".equals(command)) {
|
||||
// tasks.add(new UrbanistTaskErase(this, x, y, z));
|
||||
} else if (command.equals("createFrame")) {
|
||||
} else if ("createFrame".equals(command)) {
|
||||
createFrame(x, y, z);
|
||||
} else if (command.equals("moveFrame")) {
|
||||
} else if ("moveFrame".equals(command)) {
|
||||
moveFrame(x, y, z);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,7 +64,7 @@ public class ContainerRequester extends BuildCraftContainer implements ICommandR
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer() && command.equals("getRequestList")) {
|
||||
if (side.isServer() && "getRequestList".equals(command)) {
|
||||
final ItemStack[] stacks = new ItemStack[TileRequester.NB_ITEMS];
|
||||
|
||||
for (int i = 0; i < TileRequester.NB_ITEMS; ++i) {
|
||||
|
@ -79,7 +79,7 @@ public class ContainerRequester extends BuildCraftContainer implements ICommandR
|
|||
}
|
||||
}
|
||||
}));
|
||||
} else if (side.isClient() && command.equals("receiveRequestList")) {
|
||||
} else if (side.isClient() && "receiveRequestList".equals(command)) {
|
||||
requests = new ItemStack[TileRequester.NB_ITEMS];
|
||||
for (int i = 0; i < TileRequester.NB_ITEMS; i++) {
|
||||
requests[i] = Utils.readStack(stream);
|
||||
|
|
|
@ -77,30 +77,30 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
|
|||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isClient()) {
|
||||
if (command.equals("areaLoaded")) {
|
||||
if ("areaLoaded".equals(command)) {
|
||||
currentAreaSelection = new ZonePlan();
|
||||
currentAreaSelection.readData(stream);
|
||||
gui.refreshSelectedArea();
|
||||
} else if (command.equals("receiveImage")) {
|
||||
} else if ("receiveImage".equals(command)) {
|
||||
int size = stream.readUnsignedShort();
|
||||
for (int i = 0; i < size; ++i) {
|
||||
mapTexture.colorMap[i] = stream.readInt();
|
||||
}
|
||||
}
|
||||
} else if (side.isServer()) {
|
||||
if (command.equals("loadArea")) {
|
||||
if ("loadArea".equals(command)) {
|
||||
final int index = stream.readUnsignedByte();
|
||||
BuildCraftCore.instance.sendToPlayer((EntityPlayer) sender, new PacketCommand(this, "areaLoaded", new CommandWriter() {
|
||||
public void write(ByteBuf data) {
|
||||
map.selectArea(index).writeData(data);
|
||||
}
|
||||
}));
|
||||
} else if (command.equals("saveArea")) {
|
||||
} else if ("saveArea".equals(command)) {
|
||||
final int index = stream.readUnsignedByte();
|
||||
ZonePlan plan = new ZonePlan();
|
||||
plan.readData(stream);
|
||||
map.setArea(index, plan);
|
||||
} else if (command.equals("computeMap")) {
|
||||
} else if ("computeMap".equals(command)) {
|
||||
computeMap(stream.readInt(), stream.readInt(),
|
||||
stream.readUnsignedShort(), stream.readUnsignedShort(),
|
||||
stream.readUnsignedByte(), (EntityPlayer) sender);
|
||||
|
|
|
@ -54,7 +54,7 @@ public class TileRequester extends TileBuildCraft implements IInventory, IReques
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer() && command.equals("setRequest")) {
|
||||
if (side.isServer() && "setRequest".equals(command)) {
|
||||
setRequest(stream.readUnsignedByte(), Utils.readStack(stream));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.ArrayList;
|
|||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -24,6 +23,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ import cpw.mods.fml.relauncher.Side;
|
|||
import buildcraft.BuildCraftCore;
|
||||
import buildcraft.api.blueprints.BuilderAPI;
|
||||
import buildcraft.api.blueprints.ITileBuilder;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.IBoxProvider;
|
||||
import buildcraft.core.LaserData;
|
||||
import buildcraft.core.RFBattery;
|
||||
|
@ -69,11 +68,11 @@ public abstract class TileAbstractBuilder extends TileBuildCraft implements ITil
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer() && command.equals("uploadBuildersInAction")) {
|
||||
if (side.isServer() && "uploadBuildersInAction".equals(command)) {
|
||||
for (BuildingItem i : buildersInAction) {
|
||||
BuildCraftCore.instance.sendToPlayer((EntityPlayer) sender, createLaunchItemPacket(i));
|
||||
}
|
||||
} else if (side.isClient() && command.equals("launchItem")) {
|
||||
} else if (side.isClient() && "launchItem".equals(command)) {
|
||||
BuildingItem item = new BuildingItem();
|
||||
item.readData(stream);
|
||||
buildersInAction.add(item);
|
||||
|
|
|
@ -100,11 +100,11 @@ public class ContainerList extends BuildCraftContainer implements ICommandReceiv
|
|||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer()) {
|
||||
if (command.equals("setLabel")) {
|
||||
if ("setLabel".equals(command)) {
|
||||
setLabel(Utils.readUTF(stream));
|
||||
} else if (command.equals("switchButton")) {
|
||||
} else if ("switchButton".equals(command)) {
|
||||
switchButton(stream.readUnsignedByte(), stream.readUnsignedByte());
|
||||
} else if (command.equals("setStack")) {
|
||||
} else if ("setStack".equals(command)) {
|
||||
setStack(stream.readUnsignedByte(), stream.readUnsignedByte(), Utils.readStack(stream));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
public interface ISynchronizedTile {
|
||||
|
|
|
@ -1,11 +1,16 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.core.network;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import buildcraft.core.utils.Utils;
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ import net.minecraft.network.INetHandler;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
|
||||
import buildcraft.api.core.ISerializable;
|
||||
|
|
|
@ -711,15 +711,15 @@ public class EntityRobot extends EntityRobotBase implements
|
|||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isClient()) {
|
||||
if (command.equals("clientSetItemInUse")) {
|
||||
if ("clientSetItemInUse".equals(command)) {
|
||||
itemInUse = Utils.readStack(stream);
|
||||
} else if (command.equals("clientSetInventory")) {
|
||||
} else if ("clientSetInventory".equals(command)) {
|
||||
int slot = stream.readUnsignedShort();
|
||||
inv[slot] = Utils.readStack(stream);
|
||||
} else if (command.equals("initialize")) {
|
||||
} else if ("initialize".equals(command)) {
|
||||
itemInUse = Utils.readStack(stream);
|
||||
itemActive = stream.readBoolean();
|
||||
} else if (command.equals("setItemActive")) {
|
||||
} else if ("setItemActive".equals(command)) {
|
||||
itemActive = stream.readBoolean();
|
||||
itemActiveStage = 0;
|
||||
lastUpdateTime = new Date().getTime();
|
||||
|
@ -727,12 +727,12 @@ public class EntityRobot extends EntityRobotBase implements
|
|||
if (!itemActive) {
|
||||
setSteamDirection(0, -1, 0);
|
||||
}
|
||||
} else if (command.equals("setSteamDirection")) {
|
||||
} else if ("setSteamDirection".equals(command)) {
|
||||
setSteamDirection(stream.readInt(), stream.readShort(), stream.readInt());
|
||||
}
|
||||
} else if (side.isServer()) {
|
||||
EntityPlayer p = (EntityPlayer) sender;
|
||||
if (command.equals("requestInitialization")) {
|
||||
if ("requestInitialization".equals(command)) {
|
||||
BuildCraftCore.instance.sendToPlayer(p, new PacketCommand(this, "initialize", new CommandWriter() {
|
||||
public void write(ByteBuf data) {
|
||||
Utils.writeStack(data, itemInUse);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
*/
|
||||
package buildcraft.energy;
|
||||
|
||||
import java.util.Map;
|
||||
/* import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
|
@ -16,7 +16,7 @@ import net.minecraft.util.AxisAlignedBB;
|
|||
import buildcraft.api.core.BlockIndex;
|
||||
import buildcraft.api.core.SafeTimeTracker;
|
||||
import buildcraft.core.LaserData;
|
||||
import buildcraft.core.RFBattery;
|
||||
import buildcraft.core.RFBattery; */
|
||||
import buildcraft.core.TileBuildCraft;
|
||||
|
||||
public class TileEnergyEmitter extends TileBuildCraft {
|
||||
|
|
|
@ -9,9 +9,6 @@
|
|||
package buildcraft.energy;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import buildcraft.api.power.IEngine;
|
||||
import buildcraft.api.tiles.IHeatable;
|
||||
import buildcraft.core.utils.MathUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.ICrafting;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -19,12 +16,14 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import cofh.api.energy.IEnergyHandler;
|
||||
import buildcraft.api.power.IEngine;
|
||||
import buildcraft.api.tiles.IHeatable;
|
||||
import buildcraft.api.transport.IPipeConnection;
|
||||
import buildcraft.api.transport.IPipeTile;
|
||||
import buildcraft.api.transport.IPipeTile.PipeType;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.TileBuffer;
|
||||
import buildcraft.core.TileBuildCraft;
|
||||
import buildcraft.core.utils.MathUtils;
|
||||
import buildcraft.energy.gui.ContainerEngine;
|
||||
|
||||
public abstract class TileEngine extends TileBuildCraft implements IPipeConnection, IEnergyHandler, IEngine, IHeatable {
|
||||
|
|
|
@ -28,9 +28,9 @@ import buildcraft.api.fuels.IFuel;
|
|||
import buildcraft.api.fuels.ISolidCoolant;
|
||||
import buildcraft.core.GuiIds;
|
||||
import buildcraft.core.IItemPipe;
|
||||
import buildcraft.core.fluids.TankUtils;
|
||||
import buildcraft.core.fluids.Tank;
|
||||
import buildcraft.core.fluids.TankManager;
|
||||
import buildcraft.core.fluids.TankUtils;
|
||||
import buildcraft.core.inventory.InvUtils;
|
||||
import buildcraft.energy.gui.ContainerEngine;
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
package buildcraft.energy;
|
||||
|
||||
import buildcraft.core.utils.Utils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
|
@ -16,15 +15,16 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import buildcraft.core.inventory.SimpleInventory;
|
||||
import buildcraft.core.utils.Utils;
|
||||
|
||||
public abstract class TileEngineWithInventory extends TileEngine implements IInventory, ISidedInventory {
|
||||
|
||||
private final SimpleInventory inv;
|
||||
private final int[] SLOTS;
|
||||
private final int[] defaultSlotArray;
|
||||
|
||||
public TileEngineWithInventory(int invSize) {
|
||||
inv = new SimpleInventory(invSize, "Engine", 64);
|
||||
SLOTS = Utils.createSlotArray(0, invSize);
|
||||
defaultSlotArray = Utils.createSlotArray(0, invSize);
|
||||
}
|
||||
|
||||
/* IINVENTORY IMPLEMENTATION */
|
||||
|
@ -100,7 +100,7 @@ public abstract class TileEngineWithInventory extends TileEngine implements IInv
|
|||
if (side == orientation.ordinal()) {
|
||||
return new int[0];
|
||||
} else {
|
||||
return SLOTS;
|
||||
return defaultSlotArray;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
//import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
@ -20,8 +20,8 @@ import net.minecraft.util.ResourceLocation;
|
|||
import buildcraft.BuildCraftCore;
|
||||
import buildcraft.BuildCraftCore.RenderMode;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.EntityLaser;
|
||||
import buildcraft.core.render.RenderLaser;
|
||||
//import buildcraft.core.EntityLaser;
|
||||
//import buildcraft.core.render.RenderLaser;
|
||||
import buildcraft.energy.TileEnergyEmitter;
|
||||
//import buildcraft.energy.TileEnergyEmitter.Target;
|
||||
|
||||
|
|
|
@ -29,8 +29,8 @@ import net.minecraftforge.fluids.IFluidHandler;
|
|||
import buildcraft.api.core.BlockIndex;
|
||||
import buildcraft.api.core.BuildCraftAPI;
|
||||
import buildcraft.core.TileBuildCraft;
|
||||
import buildcraft.core.fluids.TankUtils;
|
||||
import buildcraft.core.fluids.Tank;
|
||||
import buildcraft.core.fluids.TankUtils;
|
||||
import buildcraft.core.utils.BlockUtils;
|
||||
import buildcraft.core.utils.Utils;
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
package buildcraft.factory;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
package buildcraft.factory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Deque;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
|
@ -36,8 +35,8 @@ import buildcraft.core.EntityBlock;
|
|||
import buildcraft.core.RFBattery;
|
||||
import buildcraft.core.TileBuffer;
|
||||
import buildcraft.core.TileBuildCraft;
|
||||
import buildcraft.core.fluids.TankUtils;
|
||||
import buildcraft.core.fluids.SingleUseTank;
|
||||
import buildcraft.core.fluids.TankUtils;
|
||||
import buildcraft.core.proxy.CoreProxy;
|
||||
import buildcraft.core.utils.BlockUtils;
|
||||
import buildcraft.core.utils.Utils;
|
||||
|
|
|
@ -634,9 +634,9 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
|
|||
stream.writeFloat((float) speed);
|
||||
stream.writeFloat((float) headTrajectory);
|
||||
int flags = stage.ordinal();
|
||||
flags |= (isAlive ? 0x08 : 0);
|
||||
flags |= (movingHorizontally ? 0x10 : 0);
|
||||
flags |= (movingVertically ? 0x20 : 0);
|
||||
flags |= isAlive ? 0x08 : 0;
|
||||
flags |= movingHorizontally ? 0x10 : 0;
|
||||
flags |= movingVertically ? 0x20 : 0;
|
||||
stream.writeByte(flags);
|
||||
}
|
||||
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
*/
|
||||
package buildcraft.factory;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
|
@ -34,7 +32,6 @@ import buildcraft.core.RFBattery;
|
|||
import buildcraft.core.TileBuildCraft;
|
||||
import buildcraft.core.fluids.SingleUseTank;
|
||||
import buildcraft.core.fluids.TankManager;
|
||||
import buildcraft.core.network.PacketUpdate;
|
||||
import buildcraft.core.recipes.RefineryRecipeManager;
|
||||
import buildcraft.core.utils.Utils;
|
||||
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
*/
|
||||
package buildcraft.factory;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
|
|
@ -8,12 +8,19 @@
|
|||
*/
|
||||
package buildcraft.silicon;
|
||||
|
||||
import buildcraft.silicon.gui.*;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
import buildcraft.silicon.gui.ContainerAdvancedCraftingTable;
|
||||
import buildcraft.silicon.gui.ContainerAssemblyTable;
|
||||
import buildcraft.silicon.gui.ContainerChargingTable;
|
||||
import buildcraft.silicon.gui.ContainerIntegrationTable;
|
||||
import buildcraft.silicon.gui.GuiAdvancedCraftingTable;
|
||||
import buildcraft.silicon.gui.GuiAssemblyTable;
|
||||
import buildcraft.silicon.gui.GuiChargingTable;
|
||||
import buildcraft.silicon.gui.GuiIntegrationTable;
|
||||
|
||||
public class GuiHandler implements IGuiHandler {
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@ import buildcraft.BuildCraftSilicon;
|
|||
import buildcraft.api.core.IInvSlot;
|
||||
import buildcraft.api.power.ILaserTarget;
|
||||
import buildcraft.api.tiles.IControllable;
|
||||
import buildcraft.core.TileBuffer;
|
||||
import buildcraft.core.inventory.InvUtils;
|
||||
import buildcraft.core.inventory.InventoryCopy;
|
||||
import buildcraft.core.inventory.InventoryIterator;
|
||||
|
|
|
@ -296,7 +296,7 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
|
|||
|
||||
@Override
|
||||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer() && command.equals("select")) {
|
||||
if (side.isServer() && "select".equals(command)) {
|
||||
String id = Utils.readUTF(stream);
|
||||
boolean select = stream.readBoolean();
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package buildcraft.silicon;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import buildcraft.api.tiles.IHasWork;
|
||||
import buildcraft.core.utils.StringUtils;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class TileChargingTable extends TileLaserTableBase implements IHasWork {
|
||||
@Override
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
*/
|
||||
package buildcraft.silicon.gui;
|
||||
|
||||
import buildcraft.core.gui.BuildCraftContainer;
|
||||
import buildcraft.core.gui.slots.SlotValidated;
|
||||
import buildcraft.silicon.TileChargingTable;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.ICrafting;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import buildcraft.core.gui.BuildCraftContainer;
|
||||
import buildcraft.core.gui.slots.SlotValidated;
|
||||
import buildcraft.silicon.TileChargingTable;
|
||||
|
||||
public class ContainerChargingTable extends BuildCraftContainer {
|
||||
|
||||
|
|
|
@ -8,11 +8,10 @@
|
|||
*/
|
||||
package buildcraft.silicon.gui;
|
||||
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.silicon.TileChargingTable;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.silicon.TileChargingTable;
|
||||
|
||||
public class GuiChargingTable extends GuiLaserTable {
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ import buildcraft.transport.gui.GuiEmzuliPipe;
|
|||
import buildcraft.transport.gui.GuiFilteredBuffer;
|
||||
import buildcraft.transport.gui.GuiGateInterface;
|
||||
import buildcraft.transport.pipes.PipeFluidsEmerald;
|
||||
import buildcraft.transport.pipes.PipeItemsDiamond;
|
||||
import buildcraft.transport.pipes.PipeItemsEmerald;
|
||||
import buildcraft.transport.pipes.PipeItemsEmzuli;
|
||||
|
||||
|
|
|
@ -1,7 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.transport;
|
||||
|
||||
import buildcraft.core.network.IClientState;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import buildcraft.core.network.IClientState;
|
||||
|
||||
public interface IDiamondPipe extends IClientState {
|
||||
IInventory getFilters();
|
||||
|
|
|
@ -1,7 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
|
||||
* http://www.mod-buildcraft.com
|
||||
*
|
||||
* BuildCraft is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://www.mod-buildcraft.com/MMPL-1.0.txt
|
||||
*/
|
||||
package buildcraft.transport;
|
||||
|
||||
import buildcraft.core.network.IClientState;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import buildcraft.core.network.IClientState;
|
||||
|
||||
public interface IFilteredPipe extends IClientState {
|
||||
IInventory getFilters();
|
||||
|
|
|
@ -12,8 +12,6 @@ import java.util.BitSet;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import buildcraft.core.utils.MathUtils;
|
||||
import buildcraft.transport.pipes.PipeFluidsDiamond;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
@ -28,8 +26,10 @@ import buildcraft.BuildCraftTransport;
|
|||
import buildcraft.api.core.SafeTimeTracker;
|
||||
import buildcraft.api.transport.IPipeTile.PipeType;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.utils.MathUtils;
|
||||
import buildcraft.transport.network.PacketFluidUpdate;
|
||||
import buildcraft.transport.pipes.PipeFluidsCobblestone;
|
||||
import buildcraft.transport.pipes.PipeFluidsDiamond;
|
||||
import buildcraft.transport.pipes.PipeFluidsEmerald;
|
||||
import buildcraft.transport.pipes.PipeFluidsGold;
|
||||
import buildcraft.transport.pipes.PipeFluidsIron;
|
||||
|
|
|
@ -8,15 +8,14 @@
|
|||
*/
|
||||
package buildcraft.transport.gui;
|
||||
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import buildcraft.transport.Pipe;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
|
||||
import buildcraft.core.gui.BuildCraftContainer;
|
||||
import buildcraft.core.gui.slots.SlotPhantom;
|
||||
import buildcraft.transport.pipes.PipeItemsDiamond;
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import buildcraft.transport.Pipe;
|
||||
|
||||
public class ContainerDiamondPipe extends BuildCraftContainer {
|
||||
|
||||
|
|
|
@ -332,7 +332,7 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm
|
|||
public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) {
|
||||
if (side.isServer()) {
|
||||
EntityPlayer player = (EntityPlayer) sender;
|
||||
if (command.equals("initRequest")) {
|
||||
if ("initRequest".equals(command)) {
|
||||
final String[] triggerStrings = statementsToStrings(potentialTriggers);
|
||||
final String[] actionStrings = statementsToStrings(potentialActions);
|
||||
|
||||
|
@ -349,7 +349,7 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm
|
|||
}
|
||||
}
|
||||
}));
|
||||
} else if (command.equals("selectionRequest")) {
|
||||
} else if ("selectionRequest".equals(command)) {
|
||||
for (int position = 0; position < gate.material.numSlots; position++) {
|
||||
IStatement action = gate.getAction(position);
|
||||
IStatement trigger = gate.getTrigger(position);
|
||||
|
@ -366,7 +366,7 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm
|
|||
}
|
||||
}
|
||||
} else if (side.isClient()) {
|
||||
if (command.equals("init")) {
|
||||
if ("init".equals(command)) {
|
||||
setGate(stream.readByte());
|
||||
String[] triggerStrings = new String[stream.readShort()];
|
||||
String[] actionStrings = new String[stream.readShort()];
|
||||
|
@ -382,11 +382,11 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm
|
|||
}
|
||||
}
|
||||
|
||||
if (command.equals("setAction")) {
|
||||
if ("setAction".equals(command)) {
|
||||
setAction(stream.readUnsignedByte(), Utils.readUTF(stream), false);
|
||||
} else if (command.equals("setTrigger")) {
|
||||
} else if ("setTrigger".equals(command)) {
|
||||
setTrigger(stream.readUnsignedByte(), Utils.readUTF(stream), false);
|
||||
} else if (command.equals("setActionParameter") || command.equals("setTriggerParameter")) {
|
||||
} else if ("setActionParameter".equals(command) || "setTriggerParameter".equals(command)) {
|
||||
int slot = stream.readUnsignedByte();
|
||||
int param = stream.readUnsignedByte();
|
||||
String parameterName = Utils.readUTF(stream);
|
||||
|
@ -398,7 +398,7 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm
|
|||
|
||||
if (parameter != null) {
|
||||
parameter.readFromNBT(parameterData);
|
||||
if (command.equals("setActionParameter")) {
|
||||
if ("setActionParameter".equals(command)) {
|
||||
setActionParameter(slot, param, parameter, false);
|
||||
} else {
|
||||
setTriggerParameter(slot, param, parameter, false);
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
package buildcraft.transport.gui;
|
||||
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
|
@ -18,7 +17,7 @@ import buildcraft.BuildCraftCore;
|
|||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.gui.GuiBuildCraft;
|
||||
import buildcraft.core.utils.StringUtils;
|
||||
import buildcraft.transport.pipes.PipeItemsDiamond;
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
|
||||
public class GuiDiamondPipe extends GuiBuildCraft {
|
||||
|
||||
|
|
|
@ -8,20 +8,6 @@
|
|||
*/
|
||||
package buildcraft.transport.pipes;
|
||||
|
||||
import buildcraft.BuildCraftTransport;
|
||||
import buildcraft.api.core.IIconProvider;
|
||||
import buildcraft.core.GuiIds;
|
||||
import buildcraft.core.inventory.SimpleInventory;
|
||||
import buildcraft.core.network.IClientState;
|
||||
import buildcraft.core.utils.FluidUtils;
|
||||
import buildcraft.core.utils.Utils;
|
||||
import buildcraft.transport.BlockGenericPipe;
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import buildcraft.transport.Pipe;
|
||||
import buildcraft.transport.PipeIconProvider;
|
||||
import buildcraft.transport.PipeTransportFluids;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -29,11 +15,22 @@ import net.minecraft.inventory.IInventory;
|
|||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
import buildcraft.BuildCraftTransport;
|
||||
import buildcraft.api.core.IIconProvider;
|
||||
import buildcraft.core.GuiIds;
|
||||
import buildcraft.core.inventory.SimpleInventory;
|
||||
import buildcraft.core.utils.FluidUtils;
|
||||
import buildcraft.core.utils.Utils;
|
||||
import buildcraft.transport.BlockGenericPipe;
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import buildcraft.transport.Pipe;
|
||||
import buildcraft.transport.PipeIconProvider;
|
||||
import buildcraft.transport.PipeTransportFluids;
|
||||
|
||||
public class PipeFluidsDiamond extends Pipe<PipeTransportFluids> implements IDiamondPipe {
|
||||
|
||||
|
@ -129,13 +126,15 @@ public class PipeFluidsDiamond extends Pipe<PipeTransportFluids> implements IDia
|
|||
|
||||
@Override
|
||||
public boolean outputOpen(ForgeDirection to) {
|
||||
if (!super.outputOpen(to))
|
||||
if (!super.outputOpen(to)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// get center tank, from which outputs are checked; ignore if has no fluid
|
||||
FluidTankInfo[] tanks = transport.getTankInfo(ForgeDirection.UNKNOWN);
|
||||
if (tanks == null || tanks[0] == null || tanks[0].fluid == null || tanks[0].fluid.amount == 0)
|
||||
if (tanks == null || tanks[0] == null || tanks[0].fluid == null || tanks[0].fluid.amount == 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Fluid fluidInTank = tanks[0].fluid.getFluid();
|
||||
boolean[] validFilter = new boolean[6];
|
||||
|
@ -152,12 +151,14 @@ public class PipeFluidsDiamond extends Pipe<PipeTransportFluids> implements IDia
|
|||
}
|
||||
}
|
||||
// the direction is filtered and liquids match
|
||||
if (filters.filteredDirections[to.ordinal()] && validFilter[to.ordinal()])
|
||||
if (filters.filteredDirections[to.ordinal()] && validFilter[to.ordinal()]) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// we haven't found a filter for this liquid and the direction is free
|
||||
if (!isFiltered && !filters.filteredDirections[to.ordinal()])
|
||||
if (!isFiltered && !filters.filteredDirections[to.ordinal()]) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// we have a filter for the liquid, but not a valid direction
|
||||
return false;
|
||||
|
|
|
@ -17,7 +17,6 @@ import cpw.mods.fml.relauncher.Side;
|
|||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
package buildcraft.transport.pipes;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
@ -21,8 +22,6 @@ import buildcraft.transport.PipeIconProvider;
|
|||
import buildcraft.transport.PipeTransportItems;
|
||||
import buildcraft.transport.pipes.events.PipeEventItem;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
public class PipeItemsClay extends Pipe<PipeTransportItems> {
|
||||
|
||||
public PipeItemsClay(Item item) {
|
||||
|
@ -50,13 +49,14 @@ public class PipeItemsClay extends Pipe<PipeTransportItems> {
|
|||
if (!event.item.blacklist.contains(o) && container.pipe.outputOpen(o)) {
|
||||
if (container.isPipeConnected(o)) {
|
||||
TileEntity entity = container.getTile(o);
|
||||
if (entity instanceof IPipeTile)
|
||||
if (entity instanceof IPipeTile) {
|
||||
pipesList.add(o);
|
||||
else
|
||||
} else {
|
||||
nonPipesList.add(o);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
event.destinations.clear();
|
||||
if (nonPipesList.isEmpty()) {
|
||||
event.destinations.addAll(pipesList);
|
||||
|
|
|
@ -10,7 +10,6 @@ package buildcraft.transport.pipes;
|
|||
|
||||
import java.util.LinkedList;
|
||||
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
@ -30,9 +29,9 @@ import buildcraft.api.core.IIconProvider;
|
|||
import buildcraft.core.GuiIds;
|
||||
import buildcraft.core.inventory.SimpleInventory;
|
||||
import buildcraft.core.inventory.StackHelper;
|
||||
import buildcraft.core.network.IClientState;
|
||||
import buildcraft.core.utils.Utils;
|
||||
import buildcraft.transport.BlockGenericPipe;
|
||||
import buildcraft.transport.IDiamondPipe;
|
||||
import buildcraft.transport.Pipe;
|
||||
import buildcraft.transport.PipeIconProvider;
|
||||
import buildcraft.transport.PipeTransportItems;
|
||||
|
|
Loading…
Reference in a new issue