Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

reworking files

Browse source 
*DarkGuardsman beats files with a wooden mallet* just joking but it
honestly fill like i'm doing a lot of work
This commit is contained in:
Robert 2013-12-20 04:18:42 -05:00
parent 312e46bcc4
commit 2ca9946a68
151 changed files with 613 additions and 1427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.xml
View file

@ -4,7 +4,7 @@
<property file="build.properties" />
<property environment="env" />
<property name="file.core" value="CoreMachine_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
<property name="file.core" value="AssemblyLine_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
<target name="build">
<copy todir="${dir.development}">
<fileset dir="../Minecraft Forge Latest/" />
@ -57,16 +57,18 @@
<!-- Copy compiled files into folders to be zipped -->
<copy todir="core">
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/core/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/machines/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="com/builtbroken/assemblyline/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="com/builtbroken/common/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/api/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="buildcraft/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="com/builtbroken/minecraft/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="buildcraft/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="cofh/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dan200/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="ic2/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="org/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="themalexpansion/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="universalelectricity/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="micdoodle8/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="mffs/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="org/modstats/" />
<fileset dir="${dir.mcp}/reobf/minecraft" includes="icbm/" />
<fileset dir="${dir.development}resources" excludes=".git/**" />
</copy>
<copy todir="output" file="LICENSE.txt" />

120
src/com/builtbroken/assemblyline/ALRecipeLoader.java
View file

@ -16,14 +16,22 @@ import com.builtbroken.assemblyline.item.ItemParts;
import com.builtbroken.assemblyline.item.ItemParts.Parts;
import com.builtbroken.assemblyline.machine.BlockCrate;
import com.builtbroken.assemblyline.machine.processor.BlockProcessor;
import com.dark.EnumMaterial;
import com.dark.EnumOrePart;
import com.dark.helpers.ColorCode;
import com.dark.prefab.RecipeLoader;
import com.builtbroken.minecraft.EnumMaterial;
import com.builtbroken.minecraft.EnumOrePart;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.interfaces.IToolReadOut.EnumTools;
import com.builtbroken.minecraft.prefab.RecipeLoader;
import com.builtbroken.minecraft.recipes.MachineRecipeHandler;
import com.builtbroken.minecraft.recipes.ProcessorType;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.api.reciepes.MachineRecipeHandler;
import dark.api.reciepes.ProcessorType;
import dark.machines.deco.BlockBasalt;
import dark.machines.generators.BlockSolarPanel;
import dark.machines.items.EnumTool;
import dark.machines.items.ItemCommonTool;
import dark.machines.items.ItemReadoutTools;
import dark.machines.items.ItemWrench;
import dark.machines.transmit.BlockWire;
public class ALRecipeLoader extends RecipeLoader
{
@ -54,11 +62,25 @@ public class ALRecipeLoader extends RecipeLoader
public static Block blockWasteLiquid;
public static Block blockOilLiquid;
public static Block blockFuelLiquid;
public static Block blockOre, blockDebug, blockWire;
public static Block blockStainGlass;
public static Block blockColorSand;
public static Block blockBasalt;
public static Block blockGlowGlass;
public static Block blockSteamGen, blockSolar, blockBatBox;
public static Block blockGas;
public static Item itemImprint;
public static Item itemDisk;
public static Item itemFluidCan;
public static Item itemTool, itemParts, itemMetals;
public static Item itemTool;
public static Item itemParts;
public static Item itemMetals;
public static Item battery;
public static Item wrench;
public static Item itemGlowingSand;
public static Item itemDiggingTool;
public static Item itemVehicleTest;
@Override
public void loadRecipes()
@ -191,6 +213,90 @@ public class ALRecipeLoader extends RecipeLoader
}
}
if (itemTool instanceof ItemReadoutTools)
{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemTool, 1, EnumTools.PIPE_GUAGE.ordinal()), "TVT", " T ", 'T', "ironTube", 'V', "valvePart"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemTool, 1, EnumTools.MULTI_METER.ordinal()), "PGP", "WCW", "PRP", 'P', Block.planks, 'G', Block.glass, 'C', circuit, 'W', "copperWire", 'R', "CopperCoil"));
}
if (wrench instanceof ItemWrench)
{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(wrench, 1), "S S", " S ", " S ", 'S', steel));
}
if (blockSolar instanceof BlockSolarPanel)
{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockSolar, 1), "GGG", "SCS", "SWS", 'G', Block.glass, 'W', "copperWire", 'C', circuit, 'S', steel));
}
if (blockWire instanceof BlockWire)
{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockWire, 16, 1), "III", "WWW", "III", 'I', Block.cloth, 'W', copper));
}
if (itemDiggingTool instanceof ItemCommonTool)
{
for (EnumMaterial mat : EnumMaterial.values())
{
if (mat.shouldCreateTool())
{
GameRegistry.addRecipe(new ShapedOreRecipe(EnumTool.PICKAX.getTool(mat), "III", " S ", " S ", 'I', mat.getOreName(EnumOrePart.INGOTS), 'S', Item.stick));
GameRegistry.addRecipe(new ShapedOreRecipe(EnumTool.HOE.getTool(mat), "II ", " S ", " S ", 'I', mat.getOreName(EnumOrePart.INGOTS), 'S', Item.stick));
GameRegistry.addRecipe(new ShapedOreRecipe(EnumTool.SPADE.getTool(mat), " I ", " S ", " S ", 'I', mat.getOreName(EnumOrePart.INGOTS), 'S', Item.stick));
GameRegistry.addRecipe(new ShapedOreRecipe(EnumTool.AX.getTool(mat), "II ", "IS ", " S ", 'I', mat.getOreName(EnumOrePart.INGOTS), 'S', Item.stick));
//GameRegistry.addRecipe(new ShapedOreRecipe(mat.getTool(EnumTool.SHEAR), "III", " S ", 'I', mat.getStack(EnumOrePart.INGOTS, 1)));
}
}
}
for (ColorCode code : ColorCode.values())
{
// Stained Glass //
if (blockColorSand != null)
{
if (blockStainGlass != null)
{
FurnaceRecipes.smelting().addSmelting(blockColorSand.blockID, code.ordinal(), new ItemStack(blockStainGlass, 1, code.ordinal()), 10F);
MachineRecipeHandler.newProcessorRecipe(ProcessorType.GRINDER, new ItemStack(blockStainGlass, 1, code.ordinal()), new ItemStack(blockColorSand.blockID, 1, code.ordinal()));
}
GameRegistry.addShapelessRecipe(new ItemStack(blockColorSand.blockID, 1, code.ordinal()), new Object[] { new ItemStack(blockColorSand, 1, code.ordinal()) });
MachineRecipeHandler.newProcessorRecipe(ProcessorType.GRINDER, new ItemStack(blockColorSand, 1, code.ordinal()), new ItemStack(itemGlowingSand, 1, code.ordinal()));
}
// Glowing Glass //
if (itemGlowingSand != null)
{
if (blockGlowGlass != null)
{
FurnaceRecipes.smelting().addSmelting(itemGlowingSand.itemID, code.ordinal(), new ItemStack(blockGlowGlass, 1, code.ordinal()), 10F);
MachineRecipeHandler.newProcessorRecipe(ProcessorType.GRINDER, new ItemStack(blockGlowGlass, 1, code.ordinal()), new ItemStack(itemGlowingSand, 1, code.ordinal()));
}
if (blockColorSand != null)
{
GameRegistry.addShapelessRecipe(new ItemStack(itemGlowingSand, 1, code.ordinal()), new Object[] { new ItemStack(blockColorSand.blockID, 1, code.ordinal()), Item.redstone });
GameRegistry.addShapelessRecipe(new ItemStack(itemGlowingSand, 1, code.ordinal()), new Object[] { new ItemStack(blockColorSand.blockID, 1, code.ordinal()), Item.glowstone });
MachineRecipeHandler.banProcessingOfItem(new ItemStack(itemGlowingSand, 1, code.ordinal()));
}
}
// Colored Sand //
if (blockColorSand != null)
{
GameRegistry.addRecipe(new ItemStack(blockColorSand, 8, code.ordinal()), new Object[] { "SSS", "SDS", "SSS", 'S', Block.sand, 'D', new ItemStack(Item.dyePowder, 1, code.ordinal()) });
}
}
// Extra Block //
if (blockBasalt != null)
{
GameRegistry.addShapelessRecipe(new ItemStack(blockBasalt, 1, BlockBasalt.block.COBBLE.ordinal()), new Object[] { new ItemStack(blockBasalt, 1, BlockBasalt.block.STONE.ordinal()) });
GameRegistry.addShapelessRecipe(new ItemStack(blockBasalt, 1, BlockBasalt.block.MOSSY.ordinal()), new Object[] { new ItemStack(blockBasalt, 1, BlockBasalt.block.BRICK.ordinal()), Block.vine });
GameRegistry.addShapelessRecipe(new ItemStack(blockBasalt, 2, BlockBasalt.block.CRACKED.ordinal()), new Object[] { new ItemStack(blockBasalt, 1, BlockBasalt.block.BRICK.ordinal()), new ItemStack(blockBasalt, 1, BlockBasalt.block.BRICK.ordinal()) });
GameRegistry.addRecipe(new ItemStack(blockBasalt, 4, BlockBasalt.block.BRICK.ordinal()), new Object[] { "SS", "SS", 'S', new ItemStack(blockBasalt, 1, BlockBasalt.block.STONE.ordinal()) });
GameRegistry.addRecipe(new ItemStack(blockBasalt, 8, BlockBasalt.block.CHISILED.ordinal()), new Object[] { "SSS", "S S", "SSS", 'S', new ItemStack(blockBasalt, 1, BlockBasalt.block.STONE.ordinal()) });
GameRegistry.addShapelessRecipe(new ItemStack(blockBasalt, 2, BlockBasalt.block.COBBLE.ordinal()), new Object[] { Block.cobblestone, new ItemStack(blockBasalt, 1, BlockBasalt.block.STONE.ordinal()) });
GameRegistry.addSmelting(Block.stone.blockID, new ItemStack(blockBasalt, 1, BlockBasalt.block.STONE.ordinal()), 1f);
}
}
private void createUERecipes()

89
src/com/builtbroken/assemblyline/AssemblyLine.java
View file

@ -9,12 +9,15 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;
import org.modstats.ModstatInfo;
import org.modstats.Modstats;
import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.ore.OreGenReplaceStone;
import universalelectricity.prefab.ore.OreGenerator;
import com.builtbroken.assemblyline.api.coding.TaskRegistry;
import com.builtbroken.assemblyline.armbot.BlockArmbot;
@ -36,6 +39,10 @@ import com.builtbroken.assemblyline.armbot.command.TaskRotateTo;
import com.builtbroken.assemblyline.armbot.command.TaskStart;
import com.builtbroken.assemblyline.armbot.command.TaskTake;
import com.builtbroken.assemblyline.armbot.command.TaskUse;
import com.builtbroken.assemblyline.blocks.BlockGasOre;
import com.builtbroken.assemblyline.blocks.BlockOre;
import com.builtbroken.assemblyline.blocks.GasOreGenerator;
import com.builtbroken.assemblyline.blocks.BlockOre.OreData;
import com.builtbroken.assemblyline.entities.EntityFarmEgg;
import com.builtbroken.assemblyline.entities.EnumBird;
import com.builtbroken.assemblyline.fluid.pipes.BlockPipe;
@ -66,12 +73,13 @@ import com.builtbroken.assemblyline.machine.encoder.BlockEncoder;
import com.builtbroken.assemblyline.machine.encoder.ItemDisk;
import com.builtbroken.assemblyline.machine.processor.BlockProcessor;
import com.builtbroken.assemblyline.machine.red.BlockAdvancedHopper;
import com.dark.CoreRegistry;
import com.dark.DarkCore;
import com.dark.EnumMaterial;
import com.dark.EnumOrePart;
import com.dark.IndustryTabs;
import com.dark.prefab.ItemBlockHolder;
import com.builtbroken.minecraft.CoreRegistry;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.EnumMaterial;
import com.builtbroken.minecraft.EnumOrePart;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.fluid.EnumGas;
import com.builtbroken.minecraft.prefab.ItemBlockHolder;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
@ -88,6 +96,26 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.machines.deco.BlockBasalt;
import dark.machines.deco.BlockColorGlass;
import dark.machines.deco.BlockColorGlowGlass;
import dark.machines.deco.BlockColorSand;
import dark.machines.deco.ItemBlockColored;
import dark.machines.generators.BlockSmallSteamGen;
import dark.machines.generators.BlockSolarPanel;
import dark.machines.items.ItemBattery;
import dark.machines.items.ItemBlockOre;
import dark.machines.items.ItemColoredDust;
import dark.machines.items.ItemCommonTool;
import dark.machines.items.ItemReadoutTools;
import dark.machines.items.ItemWrench;
import dark.machines.machines.BlockDebug;
import dark.machines.machines.BlockEnergyStorage;
import dark.machines.machines.ItemBlockEnergyStorage;
import dark.machines.prefab.entities.EntityTestCar;
import dark.machines.prefab.entities.ItemVehicleSpawn;
import dark.machines.transmit.BlockWire;
import dark.machines.transmit.ItemBlockWire;
@ModstatInfo(prefix = "asmline")
@Mod(modid = AssemblyLine.MOD_ID, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, dependencies = "required-after:DarkCore", useMetadata = true)
@ -176,7 +204,35 @@ public class AssemblyLine
FMLog.info("Loaded: " + TranslationHelper.loadLanguages(DarkCore.LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages.");
IndustryTabs.tabAutomation().setIconItemStack(new ItemStack(ALRecipeLoader.blockConveyorBelt));
EntityRegistry.registerGlobalEntityID(EntityTestCar.class, "TestCar", EntityRegistry.findGlobalUniqueEntityId());
EntityRegistry.registerModEntity(EntityTestCar.class, "TestCar", 60, this, 64, 1, true);
for (EnumGas gas : EnumGas.values())
{
FluidRegistry.registerFluid(gas.getGas());
}
if (ALRecipeLoader.blockGas != null)
{
EnumGas.NATURAL_GAS.getGas().setBlockID(ALRecipeLoader.blockGas);
}
if (ALRecipeLoader.blockGas != null)
{
GameRegistry.registerWorldGenerator(new GasOreGenerator());
}
if (ALRecipeLoader.blockOre != null)
{
for (OreData data : OreData.values())
{
if (data.doWorldGen)
{
OreGenReplaceStone gen = data.getGeneratorSettings();
if (gen != null)
{
OreGenerator.addOre(gen);
}
}
}
}
if (ALRecipeLoader.itemParts != null)
{
for (Parts part : Parts.values())
@ -215,6 +271,7 @@ public class AssemblyLine
recipeLoader = new ALRecipeLoader();
}
CONFIGURATION.load();
/* BLOCKS */
ALRecipeLoader.blockConveyorBelt = CoreRegistry.createNewBlock("ALBlockConveyor", AssemblyLine.MOD_ID, BlockConveyorBelt.class);
ALRecipeLoader.blockManipulator = CoreRegistry.createNewBlock("Manipulator", AssemblyLine.MOD_ID, BlockManipulator.class);
ALRecipeLoader.blockCrate = (BlockCrate) CoreRegistry.createNewBlock("Crate", AssemblyLine.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
@ -234,6 +291,26 @@ public class AssemblyLine
ALRecipeLoader.blockDrain = CoreRegistry.createNewBlock("FMBlockDrain", AssemblyLine.MOD_ID, BlockDrain.class, ItemBlockHolder.class);
ALRecipeLoader.blockConPump = CoreRegistry.createNewBlock("FMBlockConstructionPump", AssemblyLine.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class);
ALRecipeLoader.blockSteamGen = CoreRegistry.createNewBlock("DMBlockSteamMachine", AssemblyLine.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class);
ALRecipeLoader.blockOre = CoreRegistry.createNewBlock("DMBlockOre", AssemblyLine.MOD_ID, BlockOre.class, ItemBlockOre.class);
ALRecipeLoader.blockWire = CoreRegistry.createNewBlock("DMBlockWire", AssemblyLine.MOD_ID, BlockWire.class, ItemBlockWire.class);
ALRecipeLoader.blockDebug = CoreRegistry.createNewBlock("DMBlockDebug", AssemblyLine.MOD_ID, BlockDebug.class, ItemBlockHolder.class);
ALRecipeLoader.blockStainGlass = CoreRegistry.createNewBlock("DMBlockStainedGlass", AssemblyLine.MOD_ID, BlockColorGlass.class, ItemBlockColored.class);
ALRecipeLoader.blockColorSand = CoreRegistry.createNewBlock("DMBlockColorSand", AssemblyLine.MOD_ID, BlockColorSand.class, ItemBlockColored.class);
ALRecipeLoader.blockBasalt = CoreRegistry.createNewBlock("DMBlockBasalt", AssemblyLine.MOD_ID, BlockBasalt.class, ItemBlockColored.class);
ALRecipeLoader.blockGlowGlass = CoreRegistry.createNewBlock("DMBlockGlowGlass", AssemblyLine.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class);
ALRecipeLoader.blockSolar = CoreRegistry.createNewBlock("DMBlockSolar", AssemblyLine.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class);
ALRecipeLoader.blockGas = CoreRegistry.createNewBlock("DMBlockGas", AssemblyLine.MOD_ID, BlockGasOre.class, ItemBlockHolder.class);
ALRecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", AssemblyLine.MOD_ID, BlockEnergyStorage.class, ItemBlockEnergyStorage.class);
/* ITEMS */
ALRecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", AssemblyLine.MOD_ID, ItemReadoutTools.class, true);
ALRecipeLoader.battery = CoreRegistry.createNewItem("DMItemBattery", AssemblyLine.MOD_ID, ItemBattery.class, true);
ALRecipeLoader.wrench = CoreRegistry.createNewItem("DMWrench", AssemblyLine.MOD_ID, ItemWrench.class, true);
ALRecipeLoader.itemGlowingSand = CoreRegistry.createNewItem("DMItemGlowingSand", AssemblyLine.MOD_ID, ItemColoredDust.class, true);
ALRecipeLoader.itemDiggingTool = CoreRegistry.createNewItem("ItemDiggingTools", AssemblyLine.MOD_ID, ItemCommonTool.class, true);
ALRecipeLoader.itemVehicleTest = CoreRegistry.createNewItem("ItemVehicleTest", AssemblyLine.MOD_ID, ItemVehicleSpawn.class, true);
ALRecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", AssemblyLine.MOD_ID, ItemFluidCan.class, true);

22
src/com/builtbroken/assemblyline/CommonProxy.java
View file

@ -16,10 +16,14 @@ import com.builtbroken.assemblyline.machine.encoder.ContainerEncoder;
import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
import com.builtbroken.assemblyline.machine.processor.ContainerProcessor;
import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor;
import com.dark.prefab.invgui.ContainerFake;
import com.builtbroken.minecraft.prefab.invgui.ContainerFake;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.IGuiHandler;
import dark.machines.generators.ContainerCoalGenerator;
import dark.machines.generators.TileEntitySteamGen;
import dark.machines.machines.ContainerBatteryBox;
import dark.machines.machines.TileEntityBatteryBox;
public class CommonProxy implements IGuiHandler
{
@ -29,6 +33,10 @@ public class CommonProxy implements IGuiHandler
public static final int GUI_ENCODER_HELP = 4;
public static final int GUI_PROCESSOR = 5;
public static final int GUI_MANIPULATOR = 6;
public static final int GUI_COAL_GEN = 7;
public static final int GUI_FUEL_GEN = 8;
public static final int GUI_FURNACE_ELEC = 9;
public static final int GUI_BATTERY_BOX = 10;
public void preInit()
{
@ -121,7 +129,7 @@ public class CommonProxy implements IGuiHandler
}
case GUI_ENCODER:
{
if (tileEntity != null && tileEntity instanceof TileEntityEncoder)
if (tileEntity instanceof TileEntityEncoder)
{
return new ContainerEncoder(player.inventory, (TileEntityEncoder) tileEntity);
}
@ -134,6 +142,16 @@ public class CommonProxy implements IGuiHandler
{
return new ContainerProcessor(player.inventory, (TileEntityProcessor) tileEntity);
}
case GUI_COAL_GEN:
if (tileEntity instanceof TileEntitySteamGen)
{
return new ContainerCoalGenerator(player.inventory, ((TileEntitySteamGen) tileEntity));
}
case GUI_BATTERY_BOX:
if (tileEntity instanceof TileEntityBatteryBox)
{
return new ContainerBatteryBox(player.inventory, (TileEntityBatteryBox) tileEntity);
}
default:
return new ContainerFake(tileEntity);
}

2
src/com/builtbroken/assemblyline/FluidPartsMaterial.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.dark.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode;
/** Enum to hold info about each pipe material. Values are by default and some can change with pipe
* upgrades.

2
src/com/builtbroken/assemblyline/api/AutoCraftEvent.java
View file

@ -6,7 +6,7 @@ import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event;
import universalelectricity.core.vector.Vector3;
import com.dark.helpers.AutoCraftingManager.IAutoCrafter;
import com.builtbroken.minecraft.recipes.AutoCraftingManager.IAutoCrafter;
/** Events called when an automated crafter is working on crafting an item
*

2
src/com/builtbroken/assemblyline/api/coding/ITask.java
View file

@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
import com.dark.save.ISaveObj;
import com.builtbroken.minecraft.save.ISaveObj;
/** @author DarkGuardsman */
public interface ITask extends Cloneable, ISaveObj

4
src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java
View file

@ -2,8 +2,8 @@ package com.builtbroken.assemblyline.api.coding.args;
import net.minecraft.nbt.NBTTagCompound;
import com.dark.save.ISaveObj;
import com.dark.save.NBTFileHelper;
import com.builtbroken.minecraft.save.ISaveObj;
import com.builtbroken.minecraft.save.NBTFileHelper;
/** Used to store arguments in a way that can be easier to read, limit, and understand
*

2
src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java
View file

@ -5,7 +5,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import com.dark.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
/** Interface used by part that are members of a fluid tile network. Parts in the network will act as
* one entity and will be controlled by the network. This means the network need the part to access

2
src/com/builtbroken/assemblyline/armbot/BlockArmbot.java
View file

@ -16,7 +16,7 @@ import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
import com.builtbroken.assemblyline.client.render.RenderArmbot;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.common.Pair;
import com.dark.interfaces.IMultiBlock;
import com.builtbroken.minecraft.interfaces.IMultiBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/armbot/Program.java
View file

@ -13,7 +13,7 @@ import com.builtbroken.assemblyline.api.coding.IProgram;
import com.builtbroken.assemblyline.api.coding.IProgrammableMachine;
import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.api.coding.TaskRegistry;
import com.dark.save.NBTFileHelper;
import com.builtbroken.minecraft.save.NBTFileHelper;
public class Program implements IProgram
{

2
src/com/builtbroken/assemblyline/armbot/TaskBase.java
View file

@ -11,7 +11,7 @@ import com.builtbroken.assemblyline.api.coding.IProgram;
import com.builtbroken.assemblyline.api.coding.IProgrammableMachine;
import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
import com.dark.save.NBTFileHelper;
import com.builtbroken.minecraft.save.NBTFileHelper;
/** @author DarkGuardsman */
public abstract class TaskBase implements ITask

12
src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java
View file

@ -25,12 +25,12 @@ import com.builtbroken.assemblyline.api.coding.ProgramHelper;
import com.builtbroken.assemblyline.machine.TileEntityAssembly;
import com.builtbroken.assemblyline.machine.encoder.ItemDisk;
import com.builtbroken.common.Pair;
import com.dark.DarkCore;
import com.dark.helpers.DarksHelper;
import com.dark.helpers.MathHelper;
import com.dark.interfaces.IMultiBlock;
import com.dark.network.PacketHandler;
import com.dark.prefab.BlockMulti;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.helpers.DarksHelper;
import com.builtbroken.minecraft.helpers.MathHelper;
import com.builtbroken.minecraft.interfaces.IMultiBlock;
import com.builtbroken.minecraft.network.PacketHandler;
import com.builtbroken.minecraft.prefab.BlockMulti;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;

2
src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java
View file

@ -14,7 +14,7 @@ import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.builtbroken.common.Pair;
import com.dark.helpers.DarksHelper;
import com.builtbroken.minecraft.helpers.DarksHelper;
/** Used by arms to break a specific block in a position.
*

4
src/com/builtbroken/assemblyline/armbot/command/TaskGive.java
View file

@ -17,8 +17,8 @@ import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.InvInteractionHelper;
import com.dark.helpers.MathHelper;
import com.builtbroken.minecraft.helpers.InvInteractionHelper;
import com.builtbroken.minecraft.helpers.MathHelper;
public class TaskGive extends TaskBaseArmbot
{

2
src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java
View file

@ -12,7 +12,7 @@ import net.minecraft.util.AxisAlignedBB;
import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.dark.helpers.EntityDictionary;
import com.builtbroken.minecraft.helpers.EntityDictionary;
public class TaskGrabEntity extends TaskGrabPrefab
{

2
src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java
View file

@ -10,7 +10,7 @@ import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.MathHelper;
import com.builtbroken.minecraft.helpers.MathHelper;
/** Rotates an armbot by a set amount
*

2
src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java
View file

@ -10,7 +10,7 @@ import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.MathHelper;
import com.builtbroken.minecraft.helpers.MathHelper;
/** Rotates the armbot to a specific direction. If not specified, it will turn right.
*

4
src/com/builtbroken/assemblyline/armbot/command/TaskTake.java
View file

@ -16,8 +16,8 @@ import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.InvInteractionHelper;
import com.dark.helpers.MathHelper;
import com.builtbroken.minecraft.helpers.InvInteractionHelper;
import com.builtbroken.minecraft.helpers.MathHelper;
public class TaskTake extends TaskBaseArmbot
{

14
src/dark/machines/blocks/BlockGasOre.java → src/com/builtbroken/assemblyline/blocks/BlockGasOre.java
View file

@ -1,4 +1,4 @@
package dark.machines.blocks;
package com.builtbroken.assemblyline.blocks;
import java.awt.Color;
import java.util.List;
@ -21,13 +21,13 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
import universalelectricity.core.vector.Vector3;
import com.dark.DarkCore;
import com.dark.IndustryTabs;
import com.dark.fluid.EnumGas;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.fluid.EnumGas;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.CoreMachine;
/** Gas that is designed to generate underground in the same way as an ore
*
@ -42,7 +42,7 @@ public class BlockGasOre extends Block implements IFluidBlock
public BlockGasOre()
{
super(CoreMachine.CONFIGURATION.getBlock("GasBlock", DarkCore.getNextID()).getInt(), gas);
super(AssemblyLine.CONFIGURATION.getBlock("GasBlock", DarkCore.getNextID()).getInt(), gas);
this.setUnlocalizedName("DMBlockGas");
this.setCreativeTab(IndustryTabs.tabIndustrial());
this.setTickRandomly(true);
@ -147,7 +147,7 @@ public class BlockGasOre extends Block implements IFluidBlock
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.blockIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "gas");
this.blockIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "gas");
}
@Override

22
src/dark/machines/blocks/BlockOre.java → src/com/builtbroken/assemblyline/blocks/BlockOre.java
View file

@ -1,4 +1,4 @@
package dark.machines.blocks;
package com.builtbroken.assemblyline.blocks;
import java.util.List;
import java.util.Set;
@ -16,15 +16,15 @@ import net.minecraftforge.common.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.prefab.ore.OreGenReplaceStone;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.common.Pair;
import com.dark.DarkCore;
import com.dark.EnumMaterial;
import com.dark.IExtraInfo.IExtraBlockInfo;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.EnumMaterial;
import com.builtbroken.minecraft.IExtraInfo.IExtraBlockInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.CoreRecipeLoader;
import dark.machines.CoreMachine;
public class BlockOre extends Block implements IExtraBlockInfo
{
@ -32,9 +32,9 @@ public class BlockOre extends Block implements IExtraBlockInfo
public BlockOre()
{
super(CoreMachine.CONFIGURATION.getBlock("Ore", DarkCore.getNextID()).getInt(), Material.rock);
super(AssemblyLine.CONFIGURATION.getBlock("Ore", DarkCore.getNextID()).getInt(), Material.rock);
this.setCreativeTab(CreativeTabs.tabBlock);
this.setUnlocalizedName(CoreMachine.getInstance().PREFIX + "Ore");
this.setUnlocalizedName(AssemblyLine.PREFIX + "Ore");
this.setHardness(2.5f);
this.setResistance(5.0f);
@ -65,7 +65,7 @@ public class BlockOre extends Block implements IExtraBlockInfo
{
for (OreData data : OreData.values())
{
data.oreIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + data.name + "Ore");
data.oreIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + data.name + "Ore");
}
}
@ -123,8 +123,8 @@ public class BlockOre extends Block implements IExtraBlockInfo
{
if (this.doWorldGen)
{
ItemStack stack = new ItemStack(CoreRecipeLoader.blockOre, 1, this.ordinal());
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(CoreMachine.getInstance().CONFIGURATION);
ItemStack stack = new ItemStack(ALRecipeLoader.blockOre, 1, this.ordinal());
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(AssemblyLine.CONFIGURATION);
}
return null;
}

8
src/dark/machines/blocks/GasOreGenerator.java → src/com/builtbroken/assemblyline/blocks/GasOreGenerator.java
View file

@ -1,4 +1,4 @@
package dark.machines.blocks;
package com.builtbroken.assemblyline.blocks;
import java.util.Random;
@ -9,8 +9,10 @@ import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderEnd;
import net.minecraft.world.gen.ChunkProviderHell;
import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.assemblyline.ALRecipeLoader;
import cpw.mods.fml.common.IWorldGenerator;
import dark.machines.CoreRecipeLoader;
public class GasOreGenerator implements IWorldGenerator
{
@ -101,7 +103,7 @@ public class GasOreGenerator implements IWorldGenerator
Block block = Block.blocksList[blockid];
if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && (block == null || block.isAirBlock(world, x, y, z) || block.canBeReplacedByLeaves(world, x, y, z) || blockid == this.replaceID))
{
world.setBlock(x, y, z, CoreRecipeLoader.blockGas.blockID, 10 + world.rand.nextInt(5), 2);
world.setBlock(x, y, z, ALRecipeLoader.blockGas.blockID, 10 + world.rand.nextInt(5), 2);
}
}
}

9
src/com/builtbroken/assemblyline/client/ClientProxy.java
View file

@ -44,6 +44,10 @@ import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.client.gui.GuiBatteryBox;
import dark.machines.client.renders.RenderTestCar;
import dark.machines.machines.TileEntityBatteryBox;
import dark.machines.prefab.entities.EntityTestCar;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy
@ -56,6 +60,7 @@ public class ClientProxy extends CommonProxy
MinecraftForge.EVENT_BUS.register(SoundHandler.INSTANCE);
RenderingRegistry.registerEntityRenderingHandler(EntityTurkey.class, new RenderTurkey());
RenderingRegistry.registerEntityRenderingHandler(EntityFarmEgg.class, new RenderSnowball(Item.egg));
RenderingRegistry.registerEntityRenderingHandler(EntityTestCar.class, new RenderTestCar());
}
@Override
@ -76,6 +81,7 @@ public class ClientProxy extends CommonProxy
MinecraftForgeClient.registerItemRenderer(ALRecipeLoader.blockReleaseValve.blockID, new ItemPipeRenderer());
RenderingRegistry.registerBlockHandler(new BlockRenderHelper());
RenderingRegistry.registerBlockHandler(new BlockRenderingHandler());
if (ALRecipeLoader.itemFluidCan != null)
MinecraftForgeClient.registerItemRenderer(ALRecipeLoader.itemFluidCan.itemID, new ItemRenderFluidCan());
}
@ -109,12 +115,13 @@ public class ClientProxy extends CommonProxy
{
return new GuiProcessor(player.inventory, (TileEntityProcessor) tileEntity);
}
case GUI_BATTERY_BOX:
return new GuiBatteryBox(player.inventory, (TileEntityBatteryBox) tileEntity);
}
}
return null;
}
@Override
public boolean isCtrKeyDown()
{

8
src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java
View file

@ -13,10 +13,10 @@ import universalelectricity.core.vector.Vector2;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
import com.dark.DarkCore;
import com.dark.prefab.invgui.GuiBase;
import com.dark.prefab.invgui.GuiMessageBox;
import com.dark.prefab.invgui.IMessageBoxDialog;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.prefab.invgui.GuiBase;
import com.builtbroken.minecraft.prefab.invgui.GuiMessageBox;
import com.builtbroken.minecraft.prefab.invgui.IMessageBoxDialog;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;

6
src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java
View file

@ -5,9 +5,9 @@ import net.minecraft.inventory.Container;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.CommonProxy;
import com.dark.prefab.TileEntityMachine;
import com.dark.prefab.invgui.ContainerFake;
import com.dark.prefab.invgui.GuiMachineContainer;
import com.builtbroken.minecraft.prefab.TileEntityMachine;
import com.builtbroken.minecraft.prefab.invgui.ContainerFake;
import com.builtbroken.minecraft.prefab.invgui.GuiMachineContainer;
public class GuiEncoderBase extends GuiMachineContainer
{

4
src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java
View file

@ -7,8 +7,8 @@ import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
import com.dark.prefab.invgui.GuiButtonImage;
import com.dark.prefab.invgui.GuiButtonImage.ButtonIcon;
import com.builtbroken.minecraft.prefab.invgui.GuiButtonImage;
import com.builtbroken.minecraft.prefab.invgui.GuiButtonImage.ButtonIcon;
public class GuiEncoderCoder extends GuiEncoderBase
{

2
src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java
View file

@ -5,7 +5,7 @@ import net.minecraft.util.ResourceLocation;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
public class GuiEncoderHelp extends GuiEncoderBase
{

2
src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.machine.encoder.ContainerEncoder;
import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;

2
src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java
View file

@ -11,7 +11,7 @@ import universalelectricity.prefab.TranslationHelper;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.imprinter.ContainerImprinter;
import com.builtbroken.assemblyline.imprinter.TileEntityImprinter;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java
View file

@ -3,8 +3,8 @@ package com.builtbroken.assemblyline.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.prefab.TileEntityMachine;
import com.dark.prefab.invgui.GuiMachineBase;
import com.builtbroken.minecraft.prefab.TileEntityMachine;
import com.builtbroken.minecraft.prefab.invgui.GuiMachineBase;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java
View file

@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.machine.processor.ContainerProcessor;
import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/gui/GuiTask.java
View file

@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.api.coding.IRedirectTask;
import com.builtbroken.assemblyline.api.coding.ITask;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java
View file

@ -13,7 +13,7 @@ import com.builtbroken.assemblyline.armbot.command.TaskEnd;
import com.builtbroken.assemblyline.armbot.command.TaskIdle;
import com.builtbroken.assemblyline.armbot.command.TaskStart;
import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
import com.dark.interfaces.IScroll;
import com.builtbroken.minecraft.interfaces.IScroll;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;

2
src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java
View file

@ -14,7 +14,7 @@ import com.builtbroken.assemblyline.client.model.ModelGearRod;
import com.builtbroken.assemblyline.client.model.ModelGenerator;
import com.builtbroken.assemblyline.client.model.ModelPump;
import com.builtbroken.assemblyline.client.model.ModelSink;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;

2
src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java
View file

@ -15,7 +15,7 @@ import com.builtbroken.assemblyline.client.model.ModelGrinder;
import com.builtbroken.assemblyline.client.model.ModelManipulator;
import com.builtbroken.assemblyline.client.model.ModelRejectorPiston;
import com.builtbroken.assemblyline.machine.red.BlockAdvancedHopper;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;

2
src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java
View file

@ -11,7 +11,7 @@ import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.client.model.ModelReleaseValve;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;

2
src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java
View file

@ -12,7 +12,7 @@ import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelSmallFluidCan;
import com.builtbroken.assemblyline.machine.ItemFluidCan;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;

2
src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java
View file

@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelAdvancedHopper;
import com.builtbroken.assemblyline.machine.red.TileEntityAdvancedHopper;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderArmbot.java
View file

@ -19,7 +19,7 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.armbot.TileEntityArmbot;
import com.builtbroken.assemblyline.client.model.ModelArmbot;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java
View file

@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelConstructionPump;
import com.builtbroken.assemblyline.fluid.pump.TileEntityConstructionPump;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java
View file

@ -11,7 +11,7 @@ import com.builtbroken.assemblyline.client.model.ModelAngledBelt;
import com.builtbroken.assemblyline.client.model.ModelConveyorBelt;
import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt;
import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderFurnace.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelFurnace;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelGearPiston;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderManipulator.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelManipulator;
import com.builtbroken.assemblyline.machine.TileEntityManipulator;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderPipe.java
View file

@ -14,7 +14,7 @@ import com.builtbroken.assemblyline.client.model.ModelLargePipe;
import com.builtbroken.assemblyline.fluid.pipes.EnumPipeType;
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
import com.builtbroken.common.Pair;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderProcessor.java
View file

@ -11,7 +11,7 @@ import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelCrusher;
import com.builtbroken.assemblyline.client.model.ModelGrinder;
import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderPump.java
View file

@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelPump;
import com.builtbroken.assemblyline.fluid.pump.TileEntityStarterPump;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderRejector.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelRejectorPiston;
import com.builtbroken.assemblyline.machine.TileEntityRejector;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java
View file

@ -10,7 +10,7 @@ import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelLargePipe;
import com.builtbroken.assemblyline.client.model.ModelReleaseValve;
import com.builtbroken.assemblyline.machine.TileEntityReleaseValve;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderSink.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelSink;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderTank.java
View file

@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.client.model.ModelTankSide;
import com.builtbroken.assemblyline.machine.TileEntityTank;
import com.dark.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/client/render/RenderTurkey.java
View file

@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.model.ModelTurkey;
import com.builtbroken.assemblyline.entities.EntityTurkey;
import com.dark.DarkCore;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java
View file

@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.assemblyline.fluid.network.FluidRecipeInfo.SimpleFluidRecipe;
import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple;
import com.dark.fluid.FluidHelper;
import com.builtbroken.minecraft.fluid.FluidHelper;
/** Handles all kinds of process involving mixing Fluids with other fluids and/or Items, Blocks,
* ItemStack, or Liquids

6
src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java
View file

@ -8,9 +8,9 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart;
import com.dark.fluid.FluidHelper;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import com.builtbroken.minecraft.fluid.FluidHelper;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkUpdateHandler;
/** Basically the same as network Fluid tiles class with the only difference being in how it stores
* the fluid. When it goes to sort the fluid it will use the fluid properties to adjust its position

10
src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java
View file

@ -14,11 +14,11 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart;
import com.dark.fluid.FluidHelper;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.ITileNetwork;
import com.dark.tilenetwork.prefab.NetworkTileEntities;
import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import com.builtbroken.minecraft.fluid.FluidHelper;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkUpdateHandler;
public class NetworkFluidTiles extends NetworkTileEntities
{

6
src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java
View file

@ -9,9 +9,9 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.assemblyline.api.fluid.INetworkPipe;
import com.dark.fluid.FluidHelper;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import com.builtbroken.minecraft.fluid.FluidHelper;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkUpdateHandler;
/** Extension on the fluid container network to provide a more advanced reaction to fluid passing
* threw each pipe. As well this doubled as a pressure network for those machines that support the

4
src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java
View file

@ -21,8 +21,8 @@ import net.minecraftforge.fluids.FluidTankInfo;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.machine.BlockFM;
import com.builtbroken.common.Pair;
import com.dark.helpers.ColorCode;
import com.dark.helpers.ColorCode.IColorCoded;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java
View file

@ -1,7 +1,7 @@
package com.builtbroken.assemblyline.fluid.pipes;
import com.dark.helpers.ColorCode;
import com.dark.helpers.ColorCode.IColoredId;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColoredId;
public enum EnumPipeType implements IColoredId
{

4
src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java
View file

@ -1,7 +1,7 @@
package com.builtbroken.assemblyline.fluid.pipes;
import com.dark.helpers.ColorCode;
import com.dark.helpers.ColorCode.IColoredId;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColoredId;
public enum EnumTankTypes implements IColoredId
{

2
src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java
View file

@ -1,6 +1,6 @@
package com.builtbroken.assemblyline.fluid.pipes;
import com.dark.helpers.ColorCode.IColoredId;
import com.builtbroken.minecraft.helpers.ColorCode.IColoredId;
public interface IPipeType extends IColoredId
{

8
src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java
View file

@ -11,10 +11,10 @@ import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.api.fluid.INetworkPipe;
import com.builtbroken.assemblyline.fluid.network.NetworkPipes;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.dark.helpers.ColorCode;
import com.dark.helpers.ColorCode.IColorCoded;
import com.dark.tilenetwork.ITileConnector;
import com.dark.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;
import com.builtbroken.minecraft.tilenetwork.ITileConnector;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
public class TileEntityPipe extends TileEntityFluidNetworkTile implements IColorCoded, INetworkPipe
{

6
src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java
View file

@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.dark.interfaces.IToolReadOut;
import com.dark.tilenetwork.ITileConnector;
import com.dark.tilenetwork.prefab.NetworkTileEntities;
import com.builtbroken.minecraft.interfaces.IToolReadOut;
import com.builtbroken.minecraft.tilenetwork.ITileConnector;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities;
public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector
{

10
src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java
View file

@ -26,11 +26,11 @@ import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.api.fluid.FluidMasterList;
import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart;
import com.builtbroken.assemblyline.fluid.network.NetworkFluidTiles;
import com.dark.DarkCore;
import com.dark.network.ISimplePacketReceiver;
import com.dark.network.PacketHandler;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.network.ISimplePacketReceiver;
import com.builtbroken.minecraft.network.PacketHandler;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;

4
src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java
View file

@ -11,8 +11,8 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import com.dark.fluid.FluidHelper;
import com.dark.helpers.ColorCode.IColorCoded;
import com.builtbroken.minecraft.fluid.FluidHelper;
import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;
public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded
{

2
src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java
View file

@ -19,7 +19,7 @@ import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.assemblyline.machine.BlockFM;
import com.builtbroken.common.Pair;
import com.dark.tilenetwork.prefab.NetworkTileEntities;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java
View file

@ -14,7 +14,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import com.dark.fluid.FluidHelper;
import com.builtbroken.minecraft.fluid.FluidHelper;
/** A simpler path Finder used to find drainable or fillable tiles
*

2
src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java
View file

@ -22,7 +22,7 @@ import com.builtbroken.assemblyline.api.fluid.IDrain;
import com.builtbroken.assemblyline.api.fluid.INetworkPipe;
import com.builtbroken.assemblyline.fluid.network.NetworkFluidTiles;
import com.builtbroken.common.Pair;
import com.dark.tilenetwork.ITileConnector;
import com.builtbroken.minecraft.tilenetwork.ITileConnector;
public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector
{

2
src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java
View file

@ -20,7 +20,7 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.fluid.IDrain;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidDevice;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.builtbroken.minecraft.fluid.FluidHelper;
public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain
{

8
src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java
View file

@ -14,10 +14,10 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.fluid.IDrain;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.dark.interfaces.IToolReadOut;
import com.dark.prefab.TileEntityEnergyMachine;
import com.dark.tilenetwork.ITileConnector;
import com.builtbroken.minecraft.fluid.FluidHelper;
import com.builtbroken.minecraft.interfaces.IToolReadOut;
import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
import com.builtbroken.minecraft.tilenetwork.ITileConnector;
public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector
{

8
src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java
View file

@ -7,10 +7,10 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.dark.prefab.invgui.ISlotWatcher;
import com.dark.prefab.invgui.SlotCraftingResult;
import com.dark.prefab.invgui.SlotRestricted;
import com.dark.prefab.invgui.WatchedSlot;
import com.builtbroken.minecraft.prefab.invgui.ISlotWatcher;
import com.builtbroken.minecraft.prefab.invgui.SlotCraftingResult;
import com.builtbroken.minecraft.prefab.invgui.SlotRestricted;
import com.builtbroken.minecraft.prefab.invgui.WatchedSlot;
public class ContainerImprinter extends Container implements ISlotWatcher
{

2
src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java
View file

@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.IndustryTabs;
import com.builtbroken.minecraft.IndustryTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

12
src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java
View file

@ -27,12 +27,12 @@ import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.api.IArmbotUseable;
import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
import com.builtbroken.common.Pair;
import com.dark.DarkCore;
import com.dark.helpers.AutoCraftingManager;
import com.dark.helpers.AutoCraftingManager.IAutoCrafter;
import com.dark.network.PacketHandler;
import com.dark.prefab.TileEntityMulti;
import com.dark.prefab.invgui.ISlotPickResult;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.network.PacketHandler;
import com.builtbroken.minecraft.prefab.TileEntityMulti;
import com.builtbroken.minecraft.prefab.invgui.ISlotPickResult;
import com.builtbroken.minecraft.recipes.AutoCraftingManager;
import com.builtbroken.minecraft.recipes.AutoCraftingManager.IAutoCrafter;
import com.google.common.io.ByteArrayDataInput;
public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInventory, IArmbotUseable, IPacketReceiver, ISlotPickResult, IAutoCrafter

6
src/com/builtbroken/assemblyline/item/ItemFarmFood.java
View file

@ -17,9 +17,9 @@ import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraItemInfo;
import com.dark.helpers.DarksHelper;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo;
import com.builtbroken.minecraft.helpers.DarksHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

12
src/com/builtbroken/assemblyline/item/ItemOreDirv.java
View file

@ -12,12 +12,12 @@ import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.oredict.OreDictionary;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.DarkCore;
import com.dark.EnumMaterial;
import com.dark.EnumOrePart;
import com.dark.IExtraInfo.IExtraItemInfo;
import com.dark.LaserEvent;
import com.dark.prefab.ItemBasic;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.EnumMaterial;
import com.builtbroken.minecraft.EnumOrePart;
import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo;
import com.builtbroken.minecraft.LaserEvent;
import com.builtbroken.minecraft.prefab.ItemBasic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

6
src/com/builtbroken/assemblyline/item/ItemParts.java
View file

@ -10,9 +10,9 @@ import net.minecraftforge.common.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraItemInfo;
import com.dark.prefab.ItemBasic;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo;
import com.builtbroken.minecraft.prefab.ItemBasic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/com/builtbroken/assemblyline/machine/BlockAssembly.java
View file

@ -7,8 +7,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.prefab.BlockMachine;
public class BlockAssembly extends BlockMachine
{

4
src/com/builtbroken/assemblyline/machine/BlockFM.java
View file

@ -3,8 +3,8 @@ package com.builtbroken.assemblyline.machine;
import net.minecraft.block.material.Material;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.prefab.BlockMachine;
public abstract class BlockFM extends BlockMachine
{

2
src/com/builtbroken/assemblyline/machine/BlockSink.java
View file

@ -14,7 +14,7 @@ import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.builtbroken.minecraft.fluid.FluidHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/com/builtbroken/assemblyline/machine/BlockTank.java
View file

@ -19,8 +19,8 @@ import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe;
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.dark.helpers.DarksHelper;
import com.builtbroken.minecraft.fluid.FluidHelper;
import com.builtbroken.minecraft.helpers.DarksHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/machine/InventoryCrate.java
View file

@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import com.dark.prefab.invgui.InvChest;
import com.builtbroken.minecraft.prefab.invgui.InvChest;
public class InventoryCrate extends InvChest
{

4
src/com/builtbroken/assemblyline/machine/ItemFluidCan.java
View file

@ -14,8 +14,8 @@ import net.minecraftforge.fluids.ItemFluidContainer;
import universalelectricity.core.item.ElectricItemHelper;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.DarkCore;
import com.dark.IndustryTabs;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.IndustryTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

8
src/com/builtbroken/assemblyline/machine/NetworkAssembly.java
View file

@ -11,10 +11,10 @@ import universalelectricity.core.block.IElectrical;
import universalelectricity.core.block.IElectricalStorage;
import universalelectricity.core.vector.Vector3;
import com.dark.tilenetwork.INetworkEnergyPart;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.prefab.NetworkSharedPower;
import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import com.builtbroken.minecraft.tilenetwork.INetworkEnergyPart;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkSharedPower;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkUpdateHandler;
public class NetworkAssembly extends NetworkSharedPower
{

10
src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java
View file

@ -10,11 +10,11 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3;
import com.dark.prefab.TileEntityEnergyMachine;
import com.dark.tilenetwork.INetworkEnergyPart;
import com.dark.tilenetwork.ITileNetwork;
import com.dark.tilenetwork.prefab.NetworkSharedPower;
import com.dark.tilenetwork.prefab.NetworkTileEntities;
import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
import com.builtbroken.minecraft.tilenetwork.INetworkEnergyPart;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkSharedPower;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities;
/** A class to be inherited by all machines on the assembly line. This class acts as a single peace
* in a network of similar tiles allowing all to share power from one or more sources

8
src/com/builtbroken/assemblyline/machine/TileEntityCrate.java
View file

@ -9,10 +9,10 @@ import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.network.IPacketReceiver;
import com.dark.DarkCore;
import com.dark.interfaces.IExtendedStorage;
import com.dark.network.PacketHandler;
import com.dark.prefab.TileEntityInv;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.interfaces.IExtendedStorage;
import com.builtbroken.minecraft.network.PacketHandler;
import com.builtbroken.minecraft.prefab.TileEntityInv;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;

2
src/com/builtbroken/assemblyline/machine/TileEntityDetector.java
View file

@ -12,7 +12,7 @@ import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import com.dark.network.PacketHandler;
import com.builtbroken.minecraft.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;

4
src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java
View file

@ -14,8 +14,8 @@ import universalelectricity.prefab.tile.IRotatable;
import com.builtbroken.assemblyline.api.IManipulator;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import com.dark.helpers.InvInteractionHelper;
import com.dark.network.PacketHandler;
import com.builtbroken.minecraft.helpers.InvInteractionHelper;
import com.builtbroken.minecraft.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;

2
src/com/builtbroken/assemblyline/machine/TileEntityRejector.java
View file

@ -13,7 +13,7 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.IBelt;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import com.dark.network.PacketHandler;
import com.builtbroken.minecraft.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;

6
src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java
View file

@ -10,9 +10,9 @@ import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.assemblyline.api.fluid.INetworkPipe;
import com.builtbroken.assemblyline.fluid.network.NetworkPipes;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidDevice;
import com.dark.helpers.DarksHelper;
import com.dark.interfaces.IToolReadOut;
import com.dark.tilenetwork.ITileConnector;
import com.builtbroken.minecraft.helpers.DarksHelper;
import com.builtbroken.minecraft.interfaces.IToolReadOut;
import com.builtbroken.minecraft.tilenetwork.ITileConnector;
public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IToolReadOut
{

6
src/com/builtbroken/assemblyline/machine/TileEntitySink.java
View file

@ -13,9 +13,9 @@ import net.minecraftforge.fluids.FluidStack;
import universalelectricity.prefab.network.IPacketReceiver;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidStorage;
import com.dark.DarkCore;
import com.dark.helpers.ColorCode;
import com.dark.network.PacketHandler;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver

2
src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java
View file

@ -1,6 +1,6 @@
package com.builtbroken.assemblyline.machine;
import com.dark.prefab.TileEntityEnergyMachine;
import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
public class TileEntitySteamPiston extends TileEntityEnergyMachine
{

4
src/com/builtbroken/assemblyline/machine/TileEntityTank.java
View file

@ -6,8 +6,8 @@ import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart;
import com.builtbroken.assemblyline.fluid.network.NetworkFluidContainers;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
public class TileEntityTank extends TileEntityFluidNetworkTile
{

2
src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java
View file

@ -20,7 +20,7 @@ import com.builtbroken.assemblyline.client.render.RenderConveyorBelt;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType;
import com.builtbroken.common.Pair;
import com.dark.tilenetwork.prefab.NetworkItemSupply;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkItemSupply;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

10
src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java
View file

@ -12,11 +12,11 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.IBelt;
import com.builtbroken.assemblyline.machine.TileEntityAssembly;
import com.dark.prefab.TileEntityEnergyMachine;
import com.dark.tilenetwork.IMotionPath;
import com.dark.tilenetwork.INetworkPart;
import com.dark.tilenetwork.ITileNetwork;
import com.dark.tilenetwork.prefab.NetworkItemSupply;
import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
import com.builtbroken.minecraft.tilenetwork.IMotionPath;
import com.builtbroken.minecraft.tilenetwork.INetworkPart;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkItemSupply;
public class TileEntityConveyor extends TileEntityEnergyMachine implements IMotionPath, IBelt, INetworkPart
{

2
src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java
View file

@ -16,7 +16,7 @@ import universalelectricity.prefab.tile.IRotatable;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.api.IBelt;
import com.builtbroken.assemblyline.machine.TileEntityAssembly;
import com.dark.network.PacketHandler;
import com.builtbroken.minecraft.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;

2
src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java
View file

@ -7,7 +7,7 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.dark.prefab.invgui.SlotRestricted;
import com.builtbroken.minecraft.prefab.invgui.SlotRestricted;
public class ContainerEncoder extends Container
{

2
src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java
View file

@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.IndustryTabs;
import com.builtbroken.minecraft.IndustryTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

6
src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java
View file

@ -15,9 +15,9 @@ import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.api.coding.TaskRegistry;
import com.builtbroken.assemblyline.armbot.Program;
import com.builtbroken.assemblyline.armbot.command.TaskRotateTo;
import com.dark.DarkCore;
import com.dark.network.PacketHandler;
import com.dark.prefab.TileEntityMachine;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.network.PacketHandler;
import com.builtbroken.minecraft.prefab.TileEntityMachine;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.PacketDispatcher;

6
src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java
View file

@ -20,13 +20,13 @@ import com.builtbroken.assemblyline.CommonProxy;
import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
import com.builtbroken.assemblyline.client.render.RenderProcessor;
import com.builtbroken.common.Pair;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.prefab.BlockMachine;
import com.builtbroken.minecraft.recipes.ProcessorType;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.reciepes.ProcessorType;
public class BlockProcessor extends BlockMachine
{

4
src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java
View file

@ -8,11 +8,11 @@ import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotFurnace;
import net.minecraft.item.ItemStack;
import com.dark.prefab.EnergyHelper;
import com.builtbroken.minecraft.prefab.EnergyHelper;
import com.builtbroken.minecraft.recipes.MachineRecipeHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.reciepes.MachineRecipeHandler;
public class ContainerProcessor extends Container
{

14
src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java
View file

@ -6,16 +6,16 @@ import net.minecraft.network.packet.Packet;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.machine.processor.BlockProcessor.ProcessorData;
import com.dark.interfaces.IInvBox;
import com.dark.network.PacketHandler;
import com.dark.prefab.EnergyHelper;
import com.dark.prefab.TileEntityEnergyMachine;
import com.dark.prefab.invgui.InvChest;
import com.builtbroken.minecraft.interfaces.IInvBox;
import com.builtbroken.minecraft.network.PacketHandler;
import com.builtbroken.minecraft.prefab.EnergyHelper;
import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
import com.builtbroken.minecraft.prefab.invgui.InvChest;
import com.builtbroken.minecraft.recipes.MachineRecipeHandler;
import com.builtbroken.minecraft.recipes.ProcessorType;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.reciepes.MachineRecipeHandler;
import dark.api.reciepes.ProcessorType;
/** Basic A -> B recipe processor machine designed mainly to handle ore blocks
*

Some files were not shown because too many files have changed in this diff Show more