fix style
This commit is contained in:
parent
d362a062a9
commit
2afa5ceea4
39 changed files with 73 additions and 93 deletions
|
@ -8,10 +8,6 @@
|
||||||
*/
|
*/
|
||||||
package buildcraft.api.filler;
|
package buildcraft.api.filler;
|
||||||
|
|
||||||
import net.minecraft.util.IIcon;
|
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import buildcraft.api.statements.IStatement;
|
import buildcraft.api.statements.IStatement;
|
||||||
|
|
||||||
public interface IFillerPattern extends IStatement {
|
public interface IFillerPattern extends IStatement {
|
||||||
|
|
|
@ -37,7 +37,7 @@ public abstract class RobotManager {
|
||||||
aiRobots.add(aiRobot);
|
aiRobots.add(aiRobot);
|
||||||
aiRobotsByNames.put(name, aiRobot);
|
aiRobotsByNames.put(name, aiRobot);
|
||||||
aiRobotsNames.put(aiRobot, name);
|
aiRobotsNames.put(aiRobot, name);
|
||||||
if(legacyClassName != null) {
|
if (legacyClassName != null) {
|
||||||
aiRobotsByLegacyClassNames.put(legacyClassName, aiRobot);
|
aiRobotsByLegacyClassNames.put(legacyClassName, aiRobot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ public abstract class RobotManager {
|
||||||
public static void registerResourceId(Class<? extends ResourceId> resourceId, String name, String legacyClassName) {
|
public static void registerResourceId(Class<? extends ResourceId> resourceId, String name, String legacyClassName) {
|
||||||
resourceIdByNames.put(name, resourceId);
|
resourceIdByNames.put(name, resourceId);
|
||||||
resourceIdNames.put(resourceId, name);
|
resourceIdNames.put(resourceId, name);
|
||||||
if(legacyClassName != null) {
|
if (legacyClassName != null) {
|
||||||
resourceIdLegacyClassNames.put(legacyClassName, resourceId);
|
resourceIdLegacyClassNames.put(legacyClassName, resourceId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,11 @@ package buildcraft.api.transport.pluggable;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
|
|
||||||
public interface IFacadePluggable {
|
public interface IFacadePluggable {
|
||||||
public Block getCurrentBlock();
|
Block getCurrentBlock();
|
||||||
public int getCurrentMetadata();
|
|
||||||
public boolean isTransparent();
|
int getCurrentMetadata();
|
||||||
public boolean isHollow();
|
|
||||||
|
boolean isTransparent();
|
||||||
|
|
||||||
|
boolean isHollow();
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,10 +42,10 @@ import buildcraft.compat.CompatHooks;
|
||||||
import buildcraft.core.DefaultProps;
|
import buildcraft.core.DefaultProps;
|
||||||
import buildcraft.core.InterModComms;
|
import buildcraft.core.InterModComms;
|
||||||
import buildcraft.core.ItemBuildCraft;
|
import buildcraft.core.ItemBuildCraft;
|
||||||
import buildcraft.robots.ItemRobot;
|
|
||||||
import buildcraft.core.Version;
|
import buildcraft.core.Version;
|
||||||
import buildcraft.core.network.BuildCraftChannelHandler;
|
import buildcraft.core.network.BuildCraftChannelHandler;
|
||||||
import buildcraft.core.proxy.CoreProxy;
|
import buildcraft.core.proxy.CoreProxy;
|
||||||
|
import buildcraft.robots.ItemRobot;
|
||||||
import buildcraft.robots.RobotIntegrationRecipe;
|
import buildcraft.robots.RobotIntegrationRecipe;
|
||||||
import buildcraft.robots.boards.BoardRobotBomberNBT;
|
import buildcraft.robots.boards.BoardRobotBomberNBT;
|
||||||
import buildcraft.robots.boards.BoardRobotBuilderNBT;
|
import buildcraft.robots.boards.BoardRobotBuilderNBT;
|
||||||
|
@ -64,22 +64,6 @@ import buildcraft.robots.boards.BoardRobotPickerNBT;
|
||||||
import buildcraft.robots.boards.BoardRobotPlanterNBT;
|
import buildcraft.robots.boards.BoardRobotPlanterNBT;
|
||||||
import buildcraft.robots.boards.BoardRobotPumpNBT;
|
import buildcraft.robots.boards.BoardRobotPumpNBT;
|
||||||
import buildcraft.robots.boards.BoardRobotShovelmanNBT;
|
import buildcraft.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;
|
|
||||||
import buildcraft.robots.statements.ActionRobotFilter;
|
import buildcraft.robots.statements.ActionRobotFilter;
|
||||||
import buildcraft.robots.statements.ActionRobotGotoStation;
|
import buildcraft.robots.statements.ActionRobotGotoStation;
|
||||||
import buildcraft.robots.statements.ActionRobotWakeUp;
|
import buildcraft.robots.statements.ActionRobotWakeUp;
|
||||||
|
@ -96,6 +80,22 @@ import buildcraft.robots.statements.ActionStationRequestItemsMachine;
|
||||||
import buildcraft.robots.statements.RobotsActionProvider;
|
import buildcraft.robots.statements.RobotsActionProvider;
|
||||||
import buildcraft.robots.statements.RobotsTriggerProvider;
|
import buildcraft.robots.statements.RobotsTriggerProvider;
|
||||||
import buildcraft.robots.statements.TriggerRobotSleep;
|
import buildcraft.robots.statements.TriggerRobotSleep;
|
||||||
|
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;
|
||||||
|
|
||||||
@Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT)
|
@Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT)
|
||||||
public class BuildCraftSilicon extends BuildCraftMod {
|
public class BuildCraftSilicon extends BuildCraftMod {
|
||||||
|
|
|
@ -56,6 +56,8 @@ import buildcraft.core.Version;
|
||||||
import buildcraft.core.network.BuildCraftChannelHandler;
|
import buildcraft.core.network.BuildCraftChannelHandler;
|
||||||
import buildcraft.core.proxy.CoreProxy;
|
import buildcraft.core.proxy.CoreProxy;
|
||||||
import buildcraft.core.utils.ColorUtils;
|
import buildcraft.core.utils.ColorUtils;
|
||||||
|
import buildcraft.robots.ItemRobotStation;
|
||||||
|
import buildcraft.robots.RobotStationPluggable;
|
||||||
import buildcraft.silicon.ItemRedstoneChipset.Chipset;
|
import buildcraft.silicon.ItemRedstoneChipset.Chipset;
|
||||||
import buildcraft.transport.BlockFilteredBuffer;
|
import buildcraft.transport.BlockFilteredBuffer;
|
||||||
import buildcraft.transport.BlockGenericPipe;
|
import buildcraft.transport.BlockGenericPipe;
|
||||||
|
@ -120,10 +122,8 @@ import buildcraft.transport.pipes.PipePowerWood;
|
||||||
import buildcraft.transport.pipes.PipeStructureCobblestone;
|
import buildcraft.transport.pipes.PipeStructureCobblestone;
|
||||||
import buildcraft.transport.pluggable.ItemLens;
|
import buildcraft.transport.pluggable.ItemLens;
|
||||||
import buildcraft.transport.pluggable.ItemPlug;
|
import buildcraft.transport.pluggable.ItemPlug;
|
||||||
import buildcraft.robots.ItemRobotStation;
|
|
||||||
import buildcraft.transport.pluggable.LensPluggable;
|
import buildcraft.transport.pluggable.LensPluggable;
|
||||||
import buildcraft.transport.pluggable.PlugPluggable;
|
import buildcraft.transport.pluggable.PlugPluggable;
|
||||||
import buildcraft.robots.RobotStationPluggable;
|
|
||||||
import buildcraft.transport.recipes.AdvancedFacadeRecipe;
|
import buildcraft.transport.recipes.AdvancedFacadeRecipe;
|
||||||
import buildcraft.transport.recipes.GateExpansionRecipe;
|
import buildcraft.transport.recipes.GateExpansionRecipe;
|
||||||
import buildcraft.transport.recipes.GateLogicSwapRecipe;
|
import buildcraft.transport.recipes.GateLogicSwapRecipe;
|
||||||
|
@ -500,8 +500,9 @@ public class BuildCraftTransport extends BuildCraftMod {
|
||||||
public void loadRecipes() {
|
public void loadRecipes() {
|
||||||
// Add base recipe for pipe waterproof.
|
// Add base recipe for pipe waterproof.
|
||||||
GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.dye, 1, 2));
|
GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.dye, 1, 2));
|
||||||
if(additionalWaterproofingRecipe)
|
if (additionalWaterproofingRecipe) {
|
||||||
GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2));
|
GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2));
|
||||||
|
}
|
||||||
|
|
||||||
// Add pipe recipes
|
// Add pipe recipes
|
||||||
for (PipeRecipe pipe : pipeRecipes) {
|
for (PipeRecipe pipe : pipeRecipes) {
|
||||||
|
|
|
@ -64,9 +64,9 @@ import buildcraft.core.inventory.Transactor;
|
||||||
import buildcraft.core.network.BuildCraftPacket;
|
import buildcraft.core.network.BuildCraftPacket;
|
||||||
import buildcraft.core.network.CommandWriter;
|
import buildcraft.core.network.CommandWriter;
|
||||||
import buildcraft.core.network.PacketCommand;
|
import buildcraft.core.network.PacketCommand;
|
||||||
|
import buildcraft.core.utils.Utils;
|
||||||
import buildcraft.robots.ResourceIdRequest;
|
import buildcraft.robots.ResourceIdRequest;
|
||||||
import buildcraft.robots.RobotRegistry;
|
import buildcraft.robots.RobotRegistry;
|
||||||
import buildcraft.core.utils.Utils;
|
|
||||||
|
|
||||||
public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable {
|
public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable {
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,7 @@
|
||||||
package buildcraft.builders.gui;
|
package buildcraft.builders.gui;
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.renderer.texture.TextureMap;
|
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.util.IIcon;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
import buildcraft.api.filler.FillerManager;
|
import buildcraft.api.filler.FillerManager;
|
||||||
|
@ -23,14 +21,12 @@ import buildcraft.core.DefaultProps;
|
||||||
import buildcraft.core.builders.patterns.FillerPattern;
|
import buildcraft.core.builders.patterns.FillerPattern;
|
||||||
import buildcraft.core.gui.AdvancedSlot;
|
import buildcraft.core.gui.AdvancedSlot;
|
||||||
import buildcraft.core.gui.GuiAdvancedInterface;
|
import buildcraft.core.gui.GuiAdvancedInterface;
|
||||||
import buildcraft.core.gui.GuiBuildCraft;
|
|
||||||
import buildcraft.core.gui.GuiTools;
|
import buildcraft.core.gui.GuiTools;
|
||||||
import buildcraft.core.gui.StatementParameterSlot;
|
import buildcraft.core.gui.StatementParameterSlot;
|
||||||
import buildcraft.core.gui.StatementSlot;
|
import buildcraft.core.gui.StatementSlot;
|
||||||
import buildcraft.core.gui.buttons.GuiBetterButton;
|
import buildcraft.core.gui.buttons.GuiBetterButton;
|
||||||
import buildcraft.core.gui.buttons.StandardButtonTextureSets;
|
import buildcraft.core.gui.buttons.StandardButtonTextureSets;
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.core.utils.StringUtils;
|
||||||
import buildcraft.transport.Pipe;
|
|
||||||
|
|
||||||
public class GuiFiller extends GuiAdvancedInterface {
|
public class GuiFiller extends GuiAdvancedInterface {
|
||||||
class FillerParameterSlot extends StatementParameterSlot {
|
class FillerParameterSlot extends StatementParameterSlot {
|
||||||
|
|
|
@ -27,9 +27,9 @@ import buildcraft.core.inventory.StackHelper;
|
||||||
import buildcraft.core.network.CommandWriter;
|
import buildcraft.core.network.CommandWriter;
|
||||||
import buildcraft.core.network.ICommandReceiver;
|
import buildcraft.core.network.ICommandReceiver;
|
||||||
import buildcraft.core.network.PacketCommand;
|
import buildcraft.core.network.PacketCommand;
|
||||||
|
import buildcraft.core.utils.Utils;
|
||||||
import buildcraft.robots.ResourceIdRequest;
|
import buildcraft.robots.ResourceIdRequest;
|
||||||
import buildcraft.robots.RobotRegistry;
|
import buildcraft.robots.RobotRegistry;
|
||||||
import buildcraft.core.utils.Utils;
|
|
||||||
|
|
||||||
public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver {
|
public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver {
|
||||||
public static final int NB_ITEMS = 20;
|
public static final int NB_ITEMS = 20;
|
||||||
|
|
|
@ -11,8 +11,6 @@ package buildcraft.core;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import buildcraft.api.fuels.ICoolant;
|
|
||||||
import buildcraft.energy.fuels.CoolantManager;
|
|
||||||
import com.google.common.base.Splitter;
|
import com.google.common.base.Splitter;
|
||||||
import com.google.common.base.Strings;
|
import com.google.common.base.Strings;
|
||||||
import com.google.common.collect.Iterables;
|
import com.google.common.collect.Iterables;
|
||||||
|
@ -33,11 +31,13 @@ import net.minecraftforge.fluids.FluidStack;
|
||||||
|
|
||||||
import buildcraft.BuildCraftTransport;
|
import buildcraft.BuildCraftTransport;
|
||||||
import buildcraft.api.core.BCLog;
|
import buildcraft.api.core.BCLog;
|
||||||
|
import buildcraft.api.fuels.ICoolant;
|
||||||
import buildcraft.api.gates.GateExpansions;
|
import buildcraft.api.gates.GateExpansions;
|
||||||
import buildcraft.api.gates.IGateExpansion;
|
import buildcraft.api.gates.IGateExpansion;
|
||||||
import buildcraft.core.recipes.AssemblyRecipeManager;
|
import buildcraft.core.recipes.AssemblyRecipeManager;
|
||||||
import buildcraft.core.recipes.IntegrationRecipeManager;
|
import buildcraft.core.recipes.IntegrationRecipeManager;
|
||||||
import buildcraft.core.recipes.RefineryRecipeManager;
|
import buildcraft.core.recipes.RefineryRecipeManager;
|
||||||
|
import buildcraft.energy.fuels.CoolantManager;
|
||||||
import buildcraft.energy.worldgen.OilPopulate;
|
import buildcraft.energy.worldgen.OilPopulate;
|
||||||
import buildcraft.transport.ItemFacade;
|
import buildcraft.transport.ItemFacade;
|
||||||
import buildcraft.transport.recipes.GateExpansionRecipe;
|
import buildcraft.transport.recipes.GateExpansionRecipe;
|
||||||
|
@ -258,7 +258,7 @@ public final class InterModComms {
|
||||||
|
|
||||||
public static void processCoolantAddIMC(IMCEvent event, IMCMessage m) {
|
public static void processCoolantAddIMC(IMCEvent event, IMCMessage m) {
|
||||||
boolean failed = false;
|
boolean failed = false;
|
||||||
if (!m.isNBTMessage()){
|
if (!m.isNBTMessage()) {
|
||||||
failed = true;
|
failed = true;
|
||||||
} else {
|
} else {
|
||||||
NBTTagCompound tag = m.getNBTValue();
|
NBTTagCompound tag = m.getNBTValue();
|
||||||
|
|
|
@ -3,8 +3,6 @@ package buildcraft.core.gui;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
import buildcraft.api.statements.IStatementParameter;
|
import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.transport.Pipe;
|
|
||||||
import buildcraft.transport.gui.GuiGateInterface;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by asie on 1/24/15.
|
* Created by asie on 1/24/15.
|
||||||
|
|
|
@ -5,8 +5,6 @@ import net.minecraft.util.IIcon;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import buildcraft.api.statements.IStatement;
|
import buildcraft.api.statements.IStatement;
|
||||||
import buildcraft.transport.Pipe;
|
|
||||||
import buildcraft.transport.gui.GuiGateInterface;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by asie on 1/24/15.
|
* Created by asie on 1/24/15.
|
||||||
|
|
|
@ -34,10 +34,10 @@ import buildcraft.BuildCraftSilicon;
|
||||||
import buildcraft.core.EntityBlock;
|
import buildcraft.core.EntityBlock;
|
||||||
import buildcraft.core.LaserKind;
|
import buildcraft.core.LaserKind;
|
||||||
import buildcraft.core.render.RenderEntityBlock;
|
import buildcraft.core.render.RenderEntityBlock;
|
||||||
import buildcraft.robots.render.RenderRobot;
|
|
||||||
import buildcraft.core.render.RenderingEntityBlocks;
|
import buildcraft.core.render.RenderingEntityBlocks;
|
||||||
import buildcraft.core.render.RenderingMarkers;
|
import buildcraft.core.render.RenderingMarkers;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
|
import buildcraft.robots.render.RenderRobot;
|
||||||
import buildcraft.transport.render.TileEntityPickupFX;
|
import buildcraft.transport.render.TileEntityPickupFX;
|
||||||
|
|
||||||
public class CoreProxyClient extends CoreProxy {
|
public class CoreProxyClient extends CoreProxy {
|
||||||
|
|
|
@ -10,8 +10,8 @@ package buildcraft.core.utils.concurrency;
|
||||||
|
|
||||||
public interface IIterableAlgorithm {
|
public interface IIterableAlgorithm {
|
||||||
|
|
||||||
abstract void iterate();
|
void iterate();
|
||||||
|
|
||||||
abstract boolean isDone();
|
boolean isDone();
|
||||||
|
|
||||||
}
|
}
|
|
@ -30,7 +30,6 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
||||||
import buildcraft.api.robots.EntityRobotBase;
|
import buildcraft.api.robots.EntityRobotBase;
|
||||||
import buildcraft.core.CreativeTabBuildCraft;
|
import buildcraft.core.CreativeTabBuildCraft;
|
||||||
import buildcraft.core.ItemBuildCraft;
|
import buildcraft.core.ItemBuildCraft;
|
||||||
import buildcraft.robots.EntityRobot;
|
|
||||||
import buildcraft.core.utils.NBTUtils;
|
import buildcraft.core.utils.NBTUtils;
|
||||||
|
|
||||||
public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem {
|
public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem {
|
||||||
|
|
|
@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import buildcraft.BuildCraftSilicon;
|
import buildcraft.BuildCraftSilicon;
|
||||||
import buildcraft.api.recipes.CraftingResult;
|
import buildcraft.api.recipes.CraftingResult;
|
||||||
import buildcraft.robots.ItemRobot;
|
|
||||||
import buildcraft.silicon.ItemRedstoneBoard;
|
import buildcraft.silicon.ItemRedstoneBoard;
|
||||||
import buildcraft.silicon.TileIntegrationTable;
|
import buildcraft.silicon.TileIntegrationTable;
|
||||||
import buildcraft.transport.recipes.IntegrationTableRecipe;
|
import buildcraft.transport.recipes.IntegrationTableRecipe;
|
||||||
|
|
|
@ -2,12 +2,11 @@ package buildcraft.robots;
|
||||||
|
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
import buildcraft.api.transport.IPipeTile;
|
import buildcraft.api.transport.IPipeTile;
|
||||||
import buildcraft.transport.TileGenericPipe;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by asie on 1/24/15.
|
* Created by asie on 1/24/15.
|
||||||
*/
|
*/
|
||||||
public class RobotUtils {
|
public final class RobotUtils {
|
||||||
private RobotUtils() {
|
private RobotUtils() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,10 +34,10 @@ import buildcraft.robots.IStationFilter;
|
||||||
import buildcraft.robots.ResourceIdAssemblyTable;
|
import buildcraft.robots.ResourceIdAssemblyTable;
|
||||||
import buildcraft.robots.ResourceIdBlock;
|
import buildcraft.robots.ResourceIdBlock;
|
||||||
import buildcraft.robots.RobotRegistry;
|
import buildcraft.robots.RobotRegistry;
|
||||||
import buildcraft.silicon.BlockLaserTable;
|
|
||||||
import buildcraft.silicon.TileAssemblyTable;
|
|
||||||
import buildcraft.robots.statements.ActionRobotFilter;
|
import buildcraft.robots.statements.ActionRobotFilter;
|
||||||
import buildcraft.robots.statements.ActionStationAllowCraft;
|
import buildcraft.robots.statements.ActionStationAllowCraft;
|
||||||
|
import buildcraft.silicon.BlockLaserTable;
|
||||||
|
import buildcraft.silicon.TileAssemblyTable;
|
||||||
|
|
||||||
public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric {
|
public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric {
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,11 @@ import buildcraft.core.inventory.ITransactor;
|
||||||
import buildcraft.core.inventory.Transactor;
|
import buildcraft.core.inventory.Transactor;
|
||||||
import buildcraft.core.inventory.filters.ArrayStackFilter;
|
import buildcraft.core.inventory.filters.ArrayStackFilter;
|
||||||
import buildcraft.core.inventory.filters.IStackFilter;
|
import buildcraft.core.inventory.filters.IStackFilter;
|
||||||
|
import buildcraft.core.utils.IBlockFilter;
|
||||||
import buildcraft.robots.ai.AIRobotGotoBlock;
|
import buildcraft.robots.ai.AIRobotGotoBlock;
|
||||||
import buildcraft.robots.ai.AIRobotGotoStationToLoad;
|
import buildcraft.robots.ai.AIRobotGotoStationToLoad;
|
||||||
import buildcraft.robots.ai.AIRobotLoad;
|
import buildcraft.robots.ai.AIRobotLoad;
|
||||||
import buildcraft.robots.ai.AIRobotSearchRandomGroundBlock;
|
import buildcraft.robots.ai.AIRobotSearchRandomGroundBlock;
|
||||||
import buildcraft.core.utils.IBlockFilter;
|
|
||||||
|
|
||||||
public class BoardRobotBomber extends RedstoneBoardRobot {
|
public class BoardRobotBomber extends RedstoneBoardRobot {
|
||||||
|
|
||||||
|
|
|
@ -18,11 +18,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
||||||
import buildcraft.api.robots.AIRobot;
|
import buildcraft.api.robots.AIRobot;
|
||||||
import buildcraft.api.robots.EntityRobotBase;
|
import buildcraft.api.robots.EntityRobotBase;
|
||||||
import buildcraft.core.inventory.filters.IStackFilter;
|
import buildcraft.core.inventory.filters.IStackFilter;
|
||||||
|
import buildcraft.core.utils.IEntityFilter;
|
||||||
import buildcraft.robots.ai.AIRobotAttack;
|
import buildcraft.robots.ai.AIRobotAttack;
|
||||||
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
||||||
import buildcraft.robots.ai.AIRobotGotoSleep;
|
import buildcraft.robots.ai.AIRobotGotoSleep;
|
||||||
import buildcraft.robots.ai.AIRobotSearchEntity;
|
import buildcraft.robots.ai.AIRobotSearchEntity;
|
||||||
import buildcraft.core.utils.IEntityFilter;
|
|
||||||
|
|
||||||
public class BoardRobotButcher extends RedstoneBoardRobot {
|
public class BoardRobotButcher extends RedstoneBoardRobot {
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,12 @@ import buildcraft.api.robots.EntityRobotBase;
|
||||||
import buildcraft.core.inventory.filters.IStackFilter;
|
import buildcraft.core.inventory.filters.IStackFilter;
|
||||||
import buildcraft.core.utils.IBlockFilter;
|
import buildcraft.core.utils.IBlockFilter;
|
||||||
import buildcraft.robots.ResourceIdBlock;
|
import buildcraft.robots.ResourceIdBlock;
|
||||||
|
import buildcraft.robots.RobotRegistry;
|
||||||
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
||||||
import buildcraft.robots.ai.AIRobotGotoBlock;
|
import buildcraft.robots.ai.AIRobotGotoBlock;
|
||||||
import buildcraft.robots.ai.AIRobotGotoSleep;
|
import buildcraft.robots.ai.AIRobotGotoSleep;
|
||||||
import buildcraft.robots.ai.AIRobotSearchBlock;
|
import buildcraft.robots.ai.AIRobotSearchBlock;
|
||||||
import buildcraft.robots.ai.AIRobotUseToolOnBlock;
|
import buildcraft.robots.ai.AIRobotUseToolOnBlock;
|
||||||
import buildcraft.robots.RobotRegistry;
|
|
||||||
|
|
||||||
public class BoardRobotFarmer extends RedstoneBoardRobot {
|
public class BoardRobotFarmer extends RedstoneBoardRobot {
|
||||||
|
|
||||||
|
|
|
@ -24,13 +24,13 @@ import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.StatementParameterItemStack;
|
import buildcraft.api.statements.StatementParameterItemStack;
|
||||||
import buildcraft.core.inventory.filters.IStackFilter;
|
import buildcraft.core.inventory.filters.IStackFilter;
|
||||||
import buildcraft.core.utils.IBlockFilter;
|
import buildcraft.core.utils.IBlockFilter;
|
||||||
|
import buildcraft.robots.DockingStation;
|
||||||
|
import buildcraft.robots.ResourceIdBlock;
|
||||||
import buildcraft.robots.ai.AIRobotBreak;
|
import buildcraft.robots.ai.AIRobotBreak;
|
||||||
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
||||||
import buildcraft.robots.ai.AIRobotGotoBlock;
|
import buildcraft.robots.ai.AIRobotGotoBlock;
|
||||||
import buildcraft.robots.ai.AIRobotGotoSleep;
|
import buildcraft.robots.ai.AIRobotGotoSleep;
|
||||||
import buildcraft.robots.ai.AIRobotSearchBlock;
|
import buildcraft.robots.ai.AIRobotSearchBlock;
|
||||||
import buildcraft.robots.DockingStation;
|
|
||||||
import buildcraft.robots.ResourceIdBlock;
|
|
||||||
import buildcraft.robots.statements.ActionRobotFilter;
|
import buildcraft.robots.statements.ActionRobotFilter;
|
||||||
import buildcraft.transport.gates.ActionIterator;
|
import buildcraft.transport.gates.ActionIterator;
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
|
@ -18,11 +18,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
||||||
import buildcraft.api.robots.AIRobot;
|
import buildcraft.api.robots.AIRobot;
|
||||||
import buildcraft.api.robots.EntityRobotBase;
|
import buildcraft.api.robots.EntityRobotBase;
|
||||||
import buildcraft.core.inventory.filters.IStackFilter;
|
import buildcraft.core.inventory.filters.IStackFilter;
|
||||||
|
import buildcraft.core.utils.IEntityFilter;
|
||||||
import buildcraft.robots.ai.AIRobotAttack;
|
import buildcraft.robots.ai.AIRobotAttack;
|
||||||
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack;
|
||||||
import buildcraft.robots.ai.AIRobotGotoSleep;
|
import buildcraft.robots.ai.AIRobotGotoSleep;
|
||||||
import buildcraft.robots.ai.AIRobotSearchEntity;
|
import buildcraft.robots.ai.AIRobotSearchEntity;
|
||||||
import buildcraft.core.utils.IEntityFilter;
|
|
||||||
|
|
||||||
public class BoardRobotKnight extends RedstoneBoardRobot {
|
public class BoardRobotKnight extends RedstoneBoardRobot {
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,8 @@ import net.minecraft.util.ResourceLocation;
|
||||||
import buildcraft.api.boards.RedstoneBoardRobot;
|
import buildcraft.api.boards.RedstoneBoardRobot;
|
||||||
import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
||||||
import buildcraft.api.robots.EntityRobotBase;
|
import buildcraft.api.robots.EntityRobotBase;
|
||||||
import buildcraft.robots.EntityRobot;
|
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.core.utils.StringUtils;
|
||||||
|
import buildcraft.robots.EntityRobot;
|
||||||
|
|
||||||
public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT {
|
public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT {
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,8 @@ import buildcraft.core.DefaultProps;
|
||||||
import buildcraft.core.EntityLaser;
|
import buildcraft.core.EntityLaser;
|
||||||
import buildcraft.core.render.RenderLaser;
|
import buildcraft.core.render.RenderLaser;
|
||||||
import buildcraft.core.render.RenderUtils;
|
import buildcraft.core.render.RenderUtils;
|
||||||
import buildcraft.robots.ItemRobot;
|
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
|
import buildcraft.robots.ItemRobot;
|
||||||
|
|
||||||
public class RenderRobot extends Render implements IItemRenderer {
|
public class RenderRobot extends Render implements IItemRenderer {
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,9 @@ import buildcraft.core.inventory.filters.IStackFilter;
|
||||||
import buildcraft.core.inventory.filters.PassThroughFluidFilter;
|
import buildcraft.core.inventory.filters.PassThroughFluidFilter;
|
||||||
import buildcraft.core.inventory.filters.PassThroughStackFilter;
|
import buildcraft.core.inventory.filters.PassThroughStackFilter;
|
||||||
import buildcraft.core.inventory.filters.StatementParameterStackFilter;
|
import buildcraft.core.inventory.filters.StatementParameterStackFilter;
|
||||||
import buildcraft.robots.DockingStation;
|
|
||||||
import buildcraft.core.statements.BCStatement;
|
import buildcraft.core.statements.BCStatement;
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.core.utils.StringUtils;
|
||||||
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.transport.Pipe;
|
import buildcraft.transport.Pipe;
|
||||||
import buildcraft.transport.gates.ActionIterator;
|
import buildcraft.transport.gates.ActionIterator;
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
|
@ -21,15 +21,13 @@ import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.StatementParameterItemStack;
|
import buildcraft.api.statements.StatementParameterItemStack;
|
||||||
import buildcraft.api.transport.IPipeTile;
|
import buildcraft.api.transport.IPipeTile;
|
||||||
import buildcraft.core.ItemMapLocation;
|
import buildcraft.core.ItemMapLocation;
|
||||||
import buildcraft.robots.RobotUtils;
|
import buildcraft.core.statements.BCStatement;
|
||||||
import buildcraft.robots.ai.AIRobotGoAndLinkToDock;
|
import buildcraft.core.utils.StringUtils;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
import buildcraft.robots.RobotRegistry;
|
import buildcraft.robots.RobotRegistry;
|
||||||
import buildcraft.core.statements.BCStatement;
|
import buildcraft.robots.RobotUtils;
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.robots.ai.AIRobotGoAndLinkToDock;
|
||||||
import buildcraft.transport.Gate;
|
|
||||||
import buildcraft.transport.Pipe;
|
|
||||||
|
|
||||||
public class ActionRobotGotoStation extends BCStatement implements IActionInternal {
|
public class ActionRobotGotoStation extends BCStatement implements IActionInternal {
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,9 @@ import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.StatementParameterItemStack;
|
import buildcraft.api.statements.StatementParameterItemStack;
|
||||||
import buildcraft.core.inventory.ITransactor;
|
import buildcraft.core.inventory.ITransactor;
|
||||||
import buildcraft.core.inventory.Transactor;
|
import buildcraft.core.inventory.Transactor;
|
||||||
|
import buildcraft.core.utils.StringUtils;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
import buildcraft.core.utils.StringUtils;
|
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
||||||
public class ActionStationAcceptItemsInv extends ActionStationInputItems {
|
public class ActionStationAcceptItemsInv extends ActionStationInputItems {
|
||||||
|
|
|
@ -13,9 +13,9 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import buildcraft.api.core.IInvSlot;
|
import buildcraft.api.core.IInvSlot;
|
||||||
import buildcraft.api.statements.IStatementParameter;
|
import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.StatementParameterItemStack;
|
import buildcraft.api.statements.StatementParameterItemStack;
|
||||||
|
import buildcraft.core.utils.StringUtils;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
import buildcraft.core.utils.StringUtils;
|
|
||||||
import buildcraft.transport.PipeTransportItems;
|
import buildcraft.transport.PipeTransportItems;
|
||||||
import buildcraft.transport.TravelingItem;
|
import buildcraft.transport.TravelingItem;
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
|
@ -16,10 +16,10 @@ import buildcraft.api.statements.IActionInternal;
|
||||||
import buildcraft.api.statements.IStatementContainer;
|
import buildcraft.api.statements.IStatementContainer;
|
||||||
import buildcraft.api.statements.IStatementParameter;
|
import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.StatementParameterItemStack;
|
import buildcraft.api.statements.StatementParameterItemStack;
|
||||||
import buildcraft.robots.ItemRobot;
|
|
||||||
import buildcraft.robots.DockingStation;
|
|
||||||
import buildcraft.core.statements.BCStatement;
|
import buildcraft.core.statements.BCStatement;
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.core.utils.StringUtils;
|
||||||
|
import buildcraft.robots.DockingStation;
|
||||||
|
import buildcraft.robots.ItemRobot;
|
||||||
import buildcraft.transport.gates.ActionIterator;
|
import buildcraft.transport.gates.ActionIterator;
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
||||||
|
|
|
@ -13,9 +13,9 @@ import buildcraft.api.statements.IActionInternal;
|
||||||
import buildcraft.api.statements.IStatementContainer;
|
import buildcraft.api.statements.IStatementContainer;
|
||||||
import buildcraft.api.statements.IStatementParameter;
|
import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.core.inventory.filters.StatementParameterStackFilter;
|
import buildcraft.core.inventory.filters.StatementParameterStackFilter;
|
||||||
|
import buildcraft.core.statements.BCStatement;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
import buildcraft.core.statements.BCStatement;
|
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
||||||
public abstract class ActionStationInputItems extends BCStatement implements IActionInternal {
|
public abstract class ActionStationInputItems extends BCStatement implements IActionInternal {
|
||||||
|
|
|
@ -20,9 +20,9 @@ import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.StatementParameterItemStack;
|
import buildcraft.api.statements.StatementParameterItemStack;
|
||||||
import buildcraft.core.inventory.ITransactor;
|
import buildcraft.core.inventory.ITransactor;
|
||||||
import buildcraft.core.inventory.Transactor;
|
import buildcraft.core.inventory.Transactor;
|
||||||
|
import buildcraft.core.utils.StringUtils;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
import buildcraft.core.utils.StringUtils;
|
|
||||||
import buildcraft.transport.gates.StatementSlot;
|
import buildcraft.transport.gates.StatementSlot;
|
||||||
|
|
||||||
public class ActionStationRequestItems extends ActionStationInputItems {
|
public class ActionStationRequestItems extends ActionStationInputItems {
|
||||||
|
|
|
@ -27,7 +27,6 @@ import buildcraft.api.statements.IActionExternal;
|
||||||
import buildcraft.api.statements.IActionInternal;
|
import buildcraft.api.statements.IActionInternal;
|
||||||
import buildcraft.api.statements.IActionProvider;
|
import buildcraft.api.statements.IActionProvider;
|
||||||
import buildcraft.api.statements.IStatementContainer;
|
import buildcraft.api.statements.IStatementContainer;
|
||||||
import buildcraft.api.transport.IPipe;
|
|
||||||
import buildcraft.api.transport.IPipeTile;
|
import buildcraft.api.transport.IPipeTile;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.RobotUtils;
|
import buildcraft.robots.RobotUtils;
|
||||||
|
|
|
@ -17,7 +17,6 @@ import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
|
||||||
import buildcraft.BuildCraftSilicon;
|
import buildcraft.BuildCraftSilicon;
|
||||||
import buildcraft.api.statements.IActionInternal;
|
|
||||||
import buildcraft.api.statements.IStatementContainer;
|
import buildcraft.api.statements.IStatementContainer;
|
||||||
import buildcraft.api.statements.ITriggerExternal;
|
import buildcraft.api.statements.ITriggerExternal;
|
||||||
import buildcraft.api.statements.ITriggerInternal;
|
import buildcraft.api.statements.ITriggerInternal;
|
||||||
|
@ -25,7 +24,6 @@ import buildcraft.api.statements.ITriggerProvider;
|
||||||
import buildcraft.api.transport.IPipeTile;
|
import buildcraft.api.transport.IPipeTile;
|
||||||
import buildcraft.robots.DockingStation;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.robots.RobotUtils;
|
import buildcraft.robots.RobotUtils;
|
||||||
import buildcraft.transport.TileGenericPipe;
|
|
||||||
|
|
||||||
public class RobotsTriggerProvider implements ITriggerProvider {
|
public class RobotsTriggerProvider implements ITriggerProvider {
|
||||||
|
|
||||||
|
|
|
@ -12,19 +12,16 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
|
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
|
||||||
import buildcraft.api.gates.IGate;
|
|
||||||
import buildcraft.api.statements.IStatementContainer;
|
import buildcraft.api.statements.IStatementContainer;
|
||||||
import buildcraft.api.statements.IStatementParameter;
|
import buildcraft.api.statements.IStatementParameter;
|
||||||
import buildcraft.api.statements.ITriggerInternal;
|
import buildcraft.api.statements.ITriggerInternal;
|
||||||
import buildcraft.api.transport.IPipeTile;
|
import buildcraft.api.transport.IPipeTile;
|
||||||
import buildcraft.robots.RobotUtils;
|
|
||||||
import buildcraft.robots.ai.AIRobotSleep;
|
|
||||||
import buildcraft.robots.DockingStation;
|
|
||||||
import buildcraft.robots.EntityRobot;
|
|
||||||
import buildcraft.core.statements.BCStatement;
|
import buildcraft.core.statements.BCStatement;
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.core.utils.StringUtils;
|
||||||
import buildcraft.transport.Pipe;
|
import buildcraft.robots.DockingStation;
|
||||||
import buildcraft.transport.TileGenericPipe;
|
import buildcraft.robots.EntityRobot;
|
||||||
|
import buildcraft.robots.RobotUtils;
|
||||||
|
import buildcraft.robots.ai.AIRobotSleep;
|
||||||
|
|
||||||
public class TriggerRobotSleep extends BCStatement implements ITriggerInternal {
|
public class TriggerRobotSleep extends BCStatement implements ITriggerInternal {
|
||||||
|
|
||||||
|
|
|
@ -36,11 +36,11 @@ import buildcraft.core.network.CommandWriter;
|
||||||
import buildcraft.core.network.ICommandReceiver;
|
import buildcraft.core.network.ICommandReceiver;
|
||||||
import buildcraft.core.network.PacketCommand;
|
import buildcraft.core.network.PacketCommand;
|
||||||
import buildcraft.core.recipes.AssemblyRecipeManager;
|
import buildcraft.core.recipes.AssemblyRecipeManager;
|
||||||
|
import buildcraft.core.utils.StringUtils;
|
||||||
|
import buildcraft.core.utils.Utils;
|
||||||
import buildcraft.robots.EntityRobot;
|
import buildcraft.robots.EntityRobot;
|
||||||
import buildcraft.robots.ResourceIdAssemblyTable;
|
import buildcraft.robots.ResourceIdAssemblyTable;
|
||||||
import buildcraft.robots.RobotRegistry;
|
import buildcraft.robots.RobotRegistry;
|
||||||
import buildcraft.core.utils.StringUtils;
|
|
||||||
import buildcraft.core.utils.Utils;
|
|
||||||
|
|
||||||
public class TileAssemblyTable extends TileLaserTableBase implements IInventory, IFlexibleCrafter, ICommandReceiver {
|
public class TileAssemblyTable extends TileLaserTableBase implements IInventory, IFlexibleCrafter, ICommandReceiver {
|
||||||
public String currentRecipeId = "";
|
public String currentRecipeId = "";
|
||||||
|
|
|
@ -66,15 +66,15 @@ import buildcraft.core.BlockBuildCraft;
|
||||||
import buildcraft.core.CoreConstants;
|
import buildcraft.core.CoreConstants;
|
||||||
import buildcraft.core.CreativeTabBuildCraft;
|
import buildcraft.core.CreativeTabBuildCraft;
|
||||||
import buildcraft.core.ItemMapLocation;
|
import buildcraft.core.ItemMapLocation;
|
||||||
import buildcraft.robots.ItemRobot;
|
|
||||||
import buildcraft.core.TileBuffer;
|
import buildcraft.core.TileBuffer;
|
||||||
import buildcraft.robots.DockingStation;
|
|
||||||
import buildcraft.robots.EntityRobot;
|
|
||||||
import buildcraft.core.utils.MatrixTranformations;
|
import buildcraft.core.utils.MatrixTranformations;
|
||||||
import buildcraft.core.utils.Utils;
|
import buildcraft.core.utils.Utils;
|
||||||
|
import buildcraft.robots.DockingStation;
|
||||||
|
import buildcraft.robots.EntityRobot;
|
||||||
|
import buildcraft.robots.ItemRobot;
|
||||||
|
import buildcraft.robots.RobotStationPluggable;
|
||||||
import buildcraft.transport.gates.GateDefinition;
|
import buildcraft.transport.gates.GateDefinition;
|
||||||
import buildcraft.transport.gates.GatePluggable;
|
import buildcraft.transport.gates.GatePluggable;
|
||||||
import buildcraft.robots.RobotStationPluggable;
|
|
||||||
import buildcraft.transport.render.PipeRendererWorld;
|
import buildcraft.transport.render.PipeRendererWorld;
|
||||||
|
|
||||||
public class BlockGenericPipe extends BlockBuildCraft {
|
public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
|
|
|
@ -426,8 +426,9 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug
|
||||||
if (block == null) {
|
if (block == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!block.getMaterial().blocksMovement())
|
if (!block.getMaterial().blocksMovement()) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#"
|
String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#"
|
||||||
+ itemStack.getItemDamage() + "}";
|
+ itemStack.getItemDamage() + "}";
|
||||||
|
|
|
@ -9,7 +9,6 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||||
import buildcraft.api.transport.pluggable.IFacadePluggable;
|
import buildcraft.api.transport.pluggable.IFacadePluggable;
|
||||||
import buildcraft.api.transport.pluggable.PipePluggable;
|
import buildcraft.api.transport.pluggable.PipePluggable;
|
||||||
import buildcraft.transport.BlockGenericPipe;
|
import buildcraft.transport.BlockGenericPipe;
|
||||||
import buildcraft.transport.FacadePluggable;
|
|
||||||
import buildcraft.transport.TileGenericPipe;
|
import buildcraft.transport.TileGenericPipe;
|
||||||
|
|
||||||
public class FacadeBlockAccess implements IBlockAccess {
|
public class FacadeBlockAccess implements IBlockAccess {
|
||||||
|
|
|
@ -22,7 +22,6 @@ import buildcraft.api.transport.pluggable.PipePluggable;
|
||||||
import buildcraft.core.CoreConstants;
|
import buildcraft.core.CoreConstants;
|
||||||
import buildcraft.core.utils.MatrixTranformations;
|
import buildcraft.core.utils.MatrixTranformations;
|
||||||
import buildcraft.transport.BlockGenericPipe;
|
import buildcraft.transport.BlockGenericPipe;
|
||||||
import buildcraft.transport.FacadePluggable;
|
|
||||||
import buildcraft.transport.PipeIconProvider;
|
import buildcraft.transport.PipeIconProvider;
|
||||||
import buildcraft.transport.PipeRenderState;
|
import buildcraft.transport.PipeRenderState;
|
||||||
import buildcraft.transport.TileGenericPipe;
|
import buildcraft.transport.TileGenericPipe;
|
||||||
|
|
Loading…
Reference in a new issue