From 2ca9946a6806f95f75f481ced46f28fc74ae8aad Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 20 Dec 2013 04:18:42 -0500 Subject: [PATCH] reworking files *DarkGuardsman beats files with a wooden mallet* just joking but it honestly fill like i'm doing a lot of work --- build.xml | 16 +- .../assemblyline/ALRecipeLoader.java | 120 ++++++++- .../assemblyline/AssemblyLine.java | 89 ++++++- .../builtbroken/assemblyline/CommonProxy.java | 22 +- .../assemblyline/FluidPartsMaterial.java | 2 +- .../assemblyline/api/AutoCraftEvent.java | 2 +- .../assemblyline/api/coding/ITask.java | 2 +- .../api/coding/args/ArgumentData.java | 4 +- .../api/fluid/INetworkFluidPart.java | 2 +- .../assemblyline/armbot/BlockArmbot.java | 2 +- .../assemblyline/armbot/Program.java | 2 +- .../assemblyline/armbot/TaskBase.java | 2 +- .../assemblyline/armbot/TileEntityArmbot.java | 12 +- .../armbot/command/TaskBreak.java | 2 +- .../assemblyline/armbot/command/TaskGive.java | 4 +- .../armbot/command/TaskGrabEntity.java | 2 +- .../armbot/command/TaskRotateBy.java | 2 +- .../armbot/command/TaskRotateTo.java | 2 +- .../assemblyline/armbot/command/TaskTake.java | 4 +- .../assemblyline}/blocks/BlockGasOre.java | 18 +- .../assemblyline}/blocks/BlockOre.java | 22 +- .../assemblyline}/blocks/GasOreGenerator.java | 8 +- .../assemblyline/client/ClientProxy.java | 9 +- .../assemblyline/client/gui/GuiEditTask.java | 8 +- .../client/gui/GuiEncoderBase.java | 6 +- .../client/gui/GuiEncoderCoder.java | 4 +- .../client/gui/GuiEncoderHelp.java | 2 +- .../client/gui/GuiEncoderInventory.java | 2 +- .../assemblyline/client/gui/GuiImprinter.java | 2 +- .../client/gui/GuiManipulator.java | 4 +- .../assemblyline/client/gui/GuiProcessor.java | 2 +- .../assemblyline/client/gui/GuiTask.java | 2 +- .../assemblyline/client/gui/GuiTaskList.java | 2 +- .../client/render/BlockRenderHelper.java | 2 +- .../client/render/BlockRenderingHandler.java | 2 +- .../client/render/ItemPipeRenderer.java | 2 +- .../client/render/ItemRenderFluidCan.java | 2 +- .../client/render/RenderAdvancedHopper.java | 2 +- .../client/render/RenderArmbot.java | 2 +- .../client/render/RenderConstructionPump.java | 2 +- .../client/render/RenderConveyorBelt.java | 2 +- .../client/render/RenderFurnace.java | 2 +- .../client/render/RenderGearPiston.java | 2 +- .../client/render/RenderManipulator.java | 2 +- .../client/render/RenderPipe.java | 2 +- .../client/render/RenderProcessor.java | 2 +- .../client/render/RenderPump.java | 2 +- .../client/render/RenderRejector.java | 2 +- .../client/render/RenderReleaseValve.java | 2 +- .../client/render/RenderSink.java | 2 +- .../client/render/RenderTank.java | 2 +- .../client/render/RenderTurkey.java | 2 +- .../fluid/network/FluidCraftingHandler.java | 2 +- .../fluid/network/NetworkFluidContainers.java | 6 +- .../fluid/network/NetworkFluidTiles.java | 10 +- .../fluid/network/NetworkPipes.java | 6 +- .../assemblyline/fluid/pipes/BlockPipe.java | 4 +- .../fluid/pipes/EnumPipeType.java | 4 +- .../fluid/pipes/EnumTankTypes.java | 4 +- .../assemblyline/fluid/pipes/IPipeType.java | 2 +- .../fluid/pipes/TileEntityPipe.java | 8 +- .../fluid/prefab/TileEntityFluidDevice.java | 6 +- .../prefab/TileEntityFluidNetworkTile.java | 10 +- .../fluid/prefab/TileEntityFluidStorage.java | 4 +- .../fluid/pump/BlockConstructionPump.java | 2 +- .../fluid/pump/LiquidPathFinder.java | 2 +- .../pump/TileEntityConstructionPump.java | 2 +- .../fluid/pump/TileEntityDrain.java | 2 +- .../fluid/pump/TileEntityStarterPump.java | 8 +- .../imprinter/ContainerImprinter.java | 8 +- .../assemblyline/imprinter/ItemImprinter.java | 2 +- .../imprinter/TileEntityImprinter.java | 12 +- .../assemblyline/item/ItemFarmFood.java | 6 +- .../assemblyline/item/ItemOreDirv.java | 12 +- .../assemblyline/item/ItemParts.java | 6 +- .../assemblyline/machine/BlockAssembly.java | 4 +- .../assemblyline/machine/BlockFM.java | 4 +- .../assemblyline/machine/BlockSink.java | 2 +- .../assemblyline/machine/BlockTank.java | 4 +- .../assemblyline/machine/InventoryCrate.java | 2 +- .../assemblyline/machine/ItemFluidCan.java | 4 +- .../assemblyline/machine/NetworkAssembly.java | 8 +- .../machine/TileEntityAssembly.java | 10 +- .../assemblyline/machine/TileEntityCrate.java | 8 +- .../machine/TileEntityDetector.java | 2 +- .../machine/TileEntityManipulator.java | 4 +- .../machine/TileEntityRejector.java | 2 +- .../machine/TileEntityReleaseValve.java | 6 +- .../assemblyline/machine/TileEntitySink.java | 6 +- .../machine/TileEntitySteamPiston.java | 2 +- .../assemblyline/machine/TileEntityTank.java | 4 +- .../machine/belt/BlockConveyor.java | 2 +- .../machine/belt/TileEntityConveyor.java | 10 +- .../machine/belt/TileEntityConveyorBelt.java | 2 +- .../machine/encoder/ContainerEncoder.java | 2 +- .../machine/encoder/ItemDisk.java | 2 +- .../machine/encoder/TileEntityEncoder.java | 6 +- .../machine/processor/BlockProcessor.java | 6 +- .../machine/processor/ContainerProcessor.java | 4 +- .../processor/TileEntityProcessor.java | 14 +- .../machine/red/BlockAdvancedHopper.java | 4 +- .../machine/red/BlockPistonPlus.java | 2 +- .../machine/red/TileEntityAdvancedHopper.java | 4 +- .../machine/red/TileEntityPistonPlus.java | 4 +- src/dark/api/events/MachineMiningEvent.java | 79 ------ src/dark/machines/CommonProxy.java | 77 ------ src/dark/machines/CoreMachine.java | 252 ------------------ src/dark/machines/CoreRecipeLoader.java | 147 ---------- src/dark/machines/PacketManagerEffects.java | 66 ----- src/dark/machines/client/ClientProxy.java | 72 ----- src/dark/machines/client/Effects.java | 42 --- src/dark/machines/client/FXBeam.java | 241 ----------------- .../machines/client/gui/GuiBatteryBox.java | 6 +- .../client/renders/BlockRenderingHandler.java | 12 +- .../client/renders/RenderBlockSolarPanel.java | 19 +- .../client/renders/RenderBlockWire.java | 19 +- .../client/renders/RenderSteamGen.java | 23 +- .../client/renders/RenderTestCar.java | 6 +- .../client/renders/RenderTileMachine.java | 37 --- src/dark/machines/deco/BlockBasalt.java | 8 +- src/dark/machines/deco/BlockColorGlass.java | 6 +- src/dark/machines/deco/BlockColorSand.java | 7 +- src/dark/machines/deco/BlockColored.java | 11 +- src/dark/machines/deco/ItemBlockColored.java | 5 +- .../generators/BlockSmallSteamGen.java | 10 +- .../machines/generators/BlockSolarPanel.java | 8 +- .../generators/TileEntitySteamGen.java | 4 +- .../generators/TileEntitySteamPiston.java | 4 +- src/dark/machines/items/EnumTool.java | 11 +- src/dark/machines/items/ItemBattery.java | 14 +- src/dark/machines/items/ItemBlockOre.java | 9 +- src/dark/machines/items/ItemColoredDust.java | 12 +- src/dark/machines/items/ItemCommonTool.java | 15 +- src/dark/machines/items/ItemReadoutTools.java | 18 +- src/dark/machines/items/ItemWrench.java | 13 +- src/dark/machines/machines/BlockDebug.java | 10 +- .../machines/machines/BlockEnergyStorage.java | 15 +- .../machines/machines/BlockTransformer.java | 10 +- .../machines/ItemBlockEnergyStorage.java | 5 +- .../machines/TileEntityBatteryBox.java | 6 +- .../machines/TileEntityGenerator.java | 4 +- .../machines/machines/TileEntityInfFluid.java | 4 +- .../machines/machines/TileEntityInfLoad.java | 4 +- .../machines/TileEntityInfSupply.java | 4 +- src/dark/machines/prefab/ModPrefab.java | 2 +- .../prefab/entities/EntityTestCar.java | 5 +- .../prefab/entities/EntityVehicle.java | 8 +- .../prefab/entities/ItemVehicleSpawn.java | 4 +- src/dark/machines/transmit/BlockWire.java | 10 +- src/dark/machines/transmit/ItemBlockWire.java | 8 +- .../machines/transmit/TileEntityWire.java | 4 +- 151 files changed, 613 insertions(+), 1427 deletions(-) rename src/{dark/machines => com/builtbroken/assemblyline}/blocks/BlockGasOre.java (92%) rename src/{dark/machines => com/builtbroken/assemblyline}/blocks/BlockOre.java (85%) rename src/{dark/machines => com/builtbroken/assemblyline}/blocks/GasOreGenerator.java (95%) delete mode 100644 src/dark/api/events/MachineMiningEvent.java delete mode 100644 src/dark/machines/CommonProxy.java delete mode 100644 src/dark/machines/CoreMachine.java delete mode 100644 src/dark/machines/CoreRecipeLoader.java delete mode 100644 src/dark/machines/PacketManagerEffects.java delete mode 100644 src/dark/machines/client/ClientProxy.java delete mode 100644 src/dark/machines/client/Effects.java delete mode 100644 src/dark/machines/client/FXBeam.java delete mode 100644 src/dark/machines/client/renders/RenderTileMachine.java diff --git a/build.xml b/build.xml index 865c11b6..d0348c47 100644 --- a/build.xml +++ b/build.xml @@ -4,7 +4,7 @@ - + @@ -57,16 +57,18 @@ - - + - - + + + - - + + + + diff --git a/src/com/builtbroken/assemblyline/ALRecipeLoader.java b/src/com/builtbroken/assemblyline/ALRecipeLoader.java index f9526810..438eb7fe 100644 --- a/src/com/builtbroken/assemblyline/ALRecipeLoader.java +++ b/src/com/builtbroken/assemblyline/ALRecipeLoader.java @@ -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() diff --git a/src/com/builtbroken/assemblyline/AssemblyLine.java b/src/com/builtbroken/assemblyline/AssemblyLine.java index 84131256..7b83e236 100644 --- a/src/com/builtbroken/assemblyline/AssemblyLine.java +++ b/src/com/builtbroken/assemblyline/AssemblyLine.java @@ -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); diff --git a/src/com/builtbroken/assemblyline/CommonProxy.java b/src/com/builtbroken/assemblyline/CommonProxy.java index 8dbdae14..dd72a2d0 100644 --- a/src/com/builtbroken/assemblyline/CommonProxy.java +++ b/src/com/builtbroken/assemblyline/CommonProxy.java @@ -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); } diff --git a/src/com/builtbroken/assemblyline/FluidPartsMaterial.java b/src/com/builtbroken/assemblyline/FluidPartsMaterial.java index c5c8a701..844f6a76 100644 --- a/src/com/builtbroken/assemblyline/FluidPartsMaterial.java +++ b/src/com/builtbroken/assemblyline/FluidPartsMaterial.java @@ -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. diff --git a/src/com/builtbroken/assemblyline/api/AutoCraftEvent.java b/src/com/builtbroken/assemblyline/api/AutoCraftEvent.java index eb654cc0..79a0b409 100644 --- a/src/com/builtbroken/assemblyline/api/AutoCraftEvent.java +++ b/src/com/builtbroken/assemblyline/api/AutoCraftEvent.java @@ -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 * diff --git a/src/com/builtbroken/assemblyline/api/coding/ITask.java b/src/com/builtbroken/assemblyline/api/coding/ITask.java index 5e7424a2..be3b217f 100644 --- a/src/com/builtbroken/assemblyline/api/coding/ITask.java +++ b/src/com/builtbroken/assemblyline/api/coding/ITask.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java b/src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java index bc912f87..e45f162c 100644 --- a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java +++ b/src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java @@ -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 * diff --git a/src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java b/src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java index b4588545..a362d4b5 100644 --- a/src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java +++ b/src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java b/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java index 7968f415..7b6c03d5 100644 --- a/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java +++ b/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/armbot/Program.java b/src/com/builtbroken/assemblyline/armbot/Program.java index 832d5064..0c2fbb18 100644 --- a/src/com/builtbroken/assemblyline/armbot/Program.java +++ b/src/com/builtbroken/assemblyline/armbot/Program.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/armbot/TaskBase.java b/src/com/builtbroken/assemblyline/armbot/TaskBase.java index 69a8f7a3..2d2556ce 100644 --- a/src/com/builtbroken/assemblyline/armbot/TaskBase.java +++ b/src/com/builtbroken/assemblyline/armbot/TaskBase.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java b/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java index 1c07a94d..a5a2dd71 100644 --- a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java +++ b/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java b/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java index 7282461a..fd3cedf6 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java @@ -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. * diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java b/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java index 10681ccb..acbacf83 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java index 053d433a..21344801 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java index ce9fa1ed..c1c70130 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java @@ -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 * diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java index 22b2b560..eec7d099 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java @@ -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. * diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java b/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java index 812e96ee..25715be7 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java @@ -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 { diff --git a/src/dark/machines/blocks/BlockGasOre.java b/src/com/builtbroken/assemblyline/blocks/BlockGasOre.java similarity index 92% rename from src/dark/machines/blocks/BlockGasOre.java rename to src/com/builtbroken/assemblyline/blocks/BlockGasOre.java index a9842cc2..7c9e69a2 100644 --- a/src/dark/machines/blocks/BlockGasOre.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockGasOre.java @@ -1,4 +1,4 @@ -package dark.machines.blocks; +package com.builtbroken.assemblyline.blocks; import java.awt.Color; import java.util.List; @@ -21,19 +21,19 @@ 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 - * + * * TODO code actual gas behavior such as expanding to fill an area but at the same time losing * volume - * + * * @author DarkGuardsman */ public class BlockGasOre extends Block implements IFluidBlock { @@ -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 diff --git a/src/dark/machines/blocks/BlockOre.java b/src/com/builtbroken/assemblyline/blocks/BlockOre.java similarity index 85% rename from src/dark/machines/blocks/BlockOre.java rename to src/com/builtbroken/assemblyline/blocks/BlockOre.java index dc4d1c4a..c2ed9872 100644 --- a/src/dark/machines/blocks/BlockOre.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockOre.java @@ -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; } diff --git a/src/dark/machines/blocks/GasOreGenerator.java b/src/com/builtbroken/assemblyline/blocks/GasOreGenerator.java similarity index 95% rename from src/dark/machines/blocks/GasOreGenerator.java rename to src/com/builtbroken/assemblyline/blocks/GasOreGenerator.java index f3620855..223bb4bc 100644 --- a/src/dark/machines/blocks/GasOreGenerator.java +++ b/src/com/builtbroken/assemblyline/blocks/GasOreGenerator.java @@ -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); } } } diff --git a/src/com/builtbroken/assemblyline/client/ClientProxy.java b/src/com/builtbroken/assemblyline/client/ClientProxy.java index 85f7a747..1cce240b 100644 --- a/src/com/builtbroken/assemblyline/client/ClientProxy.java +++ b/src/com/builtbroken/assemblyline/client/ClientProxy.java @@ -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() { diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java b/src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java index 09017552..d804bd9a 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java index 8ed22cfd..2813cece 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java index 5de2c1e2..6de74225 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java index 3a7504db..c3f3ca63 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java index 2ad0c21b..73950622 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java b/src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java index 35a43d7a..e20829de 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java b/src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java index 4afd33e7..5755d234 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java b/src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java index a68964c0..2fa5aeaa 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiTask.java b/src/com/builtbroken/assemblyline/client/gui/GuiTask.java index 2db4b2bc..ffb85ea5 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiTask.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiTask.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java b/src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java index 3aa99461..00e8b476 100644 --- a/src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java +++ b/src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java b/src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java index fb341807..7307afc6 100644 --- a/src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java +++ b/src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java b/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java index 06119c4c..13e86b3b 100644 --- a/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java +++ b/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java b/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java index 7faa50f0..216cff3d 100644 --- a/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java +++ b/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java b/src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java index 778cbfc0..5ac71217 100644 --- a/src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java +++ b/src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java b/src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java index bfbc5ba5..194cc1a7 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderArmbot.java b/src/com/builtbroken/assemblyline/client/render/RenderArmbot.java index a65dcef8..80213a3f 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderArmbot.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderArmbot.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java b/src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java index 4f9a6083..b3656333 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java b/src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java index 04d723e3..9fd68075 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderFurnace.java b/src/com/builtbroken/assemblyline/client/render/RenderFurnace.java index e772d88e..321759f2 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderFurnace.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderFurnace.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java b/src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java index 2b76e889..f35e1484 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderManipulator.java b/src/com/builtbroken/assemblyline/client/render/RenderManipulator.java index a55b0e6f..cb1a7648 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderManipulator.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderManipulator.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderPipe.java b/src/com/builtbroken/assemblyline/client/render/RenderPipe.java index 500b787f..59c59b45 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderPipe.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderPipe.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderProcessor.java b/src/com/builtbroken/assemblyline/client/render/RenderProcessor.java index 2574aa95..96676ed4 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderProcessor.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderProcessor.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderPump.java b/src/com/builtbroken/assemblyline/client/render/RenderPump.java index 27f20c9d..d8e2bc25 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderPump.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderPump.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderRejector.java b/src/com/builtbroken/assemblyline/client/render/RenderRejector.java index 9c5610c7..a077f06e 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderRejector.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderRejector.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java b/src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java index aa666ed3..f1958fbe 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderSink.java b/src/com/builtbroken/assemblyline/client/render/RenderSink.java index 35b1ea50..31273589 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderSink.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderSink.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderTank.java b/src/com/builtbroken/assemblyline/client/render/RenderTank.java index ecc6803a..91a234e8 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderTank.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderTank.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderTurkey.java b/src/com/builtbroken/assemblyline/client/render/RenderTurkey.java index 31bc2d94..da93bb79 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderTurkey.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderTurkey.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java b/src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java index ea5d131b..d3737bad 100644 --- a/src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java +++ b/src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java b/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java index 28f0c620..e68df5a5 100644 --- a/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java +++ b/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java b/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java index a0aa0869..6f3fbf07 100644 --- a/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java +++ b/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java b/src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java index b8dcc349..027d431a 100644 --- a/src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java +++ b/src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java b/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java index 6b930869..17220610 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java b/src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java index 7814f8b1..39280d2b 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java b/src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java index fa306e8d..b6303365 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java b/src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java index fcda3bac..2b94aa7e 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java b/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java index 6bb57a30..4402811b 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java index d8ab6abc..6fdaf1b9 100644 --- a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java +++ b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java index f2d26842..93503902 100644 --- a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java +++ b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java index c3b877ac..bd77fa3c 100644 --- a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java +++ b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java b/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java index 246e0569..ac6dbc40 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java b/src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java index 3f5cc20e..99f5f045 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java @@ -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 * diff --git a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java b/src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java index a1dd673d..42e60477 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java b/src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java index 92e7d3a2..1f12bd3c 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java b/src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java index 73e42cf0..cfdc8800 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java b/src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java index 982280db..674e00d6 100644 --- a/src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java +++ b/src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java b/src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java index 5ef63460..8d911ff9 100644 --- a/src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java +++ b/src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java b/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java index 4c8586ff..fa6e87f5 100644 --- a/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java +++ b/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/item/ItemFarmFood.java b/src/com/builtbroken/assemblyline/item/ItemFarmFood.java index 71dc59ce..fda83341 100644 --- a/src/com/builtbroken/assemblyline/item/ItemFarmFood.java +++ b/src/com/builtbroken/assemblyline/item/ItemFarmFood.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/item/ItemOreDirv.java b/src/com/builtbroken/assemblyline/item/ItemOreDirv.java index 8964884a..e507b249 100644 --- a/src/com/builtbroken/assemblyline/item/ItemOreDirv.java +++ b/src/com/builtbroken/assemblyline/item/ItemOreDirv.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/item/ItemParts.java b/src/com/builtbroken/assemblyline/item/ItemParts.java index b7e4e65b..3acdbdcd 100644 --- a/src/com/builtbroken/assemblyline/item/ItemParts.java +++ b/src/com/builtbroken/assemblyline/item/ItemParts.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockAssembly.java b/src/com/builtbroken/assemblyline/machine/BlockAssembly.java index 74269eb8..527f9975 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockAssembly.java +++ b/src/com/builtbroken/assemblyline/machine/BlockAssembly.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/BlockFM.java b/src/com/builtbroken/assemblyline/machine/BlockFM.java index 01e96479..b4ffea21 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockFM.java +++ b/src/com/builtbroken/assemblyline/machine/BlockFM.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/BlockSink.java b/src/com/builtbroken/assemblyline/machine/BlockSink.java index 4f8f2f34..37ee20e9 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockSink.java +++ b/src/com/builtbroken/assemblyline/machine/BlockSink.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockTank.java b/src/com/builtbroken/assemblyline/machine/BlockTank.java index 4cc54de3..eba5ce06 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockTank.java +++ b/src/com/builtbroken/assemblyline/machine/BlockTank.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/InventoryCrate.java b/src/com/builtbroken/assemblyline/machine/InventoryCrate.java index 5747306a..5d9c68bc 100644 --- a/src/com/builtbroken/assemblyline/machine/InventoryCrate.java +++ b/src/com/builtbroken/assemblyline/machine/InventoryCrate.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/ItemFluidCan.java b/src/com/builtbroken/assemblyline/machine/ItemFluidCan.java index aeda5b05..77b117e3 100644 --- a/src/com/builtbroken/assemblyline/machine/ItemFluidCan.java +++ b/src/com/builtbroken/assemblyline/machine/ItemFluidCan.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/NetworkAssembly.java b/src/com/builtbroken/assemblyline/machine/NetworkAssembly.java index 5be392ab..6564a3df 100644 --- a/src/com/builtbroken/assemblyline/machine/NetworkAssembly.java +++ b/src/com/builtbroken/assemblyline/machine/NetworkAssembly.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java b/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java index 1ef53f3d..ed9a1620 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityCrate.java b/src/com/builtbroken/assemblyline/machine/TileEntityCrate.java index c021f086..7e197a9d 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityCrate.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityCrate.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityDetector.java b/src/com/builtbroken/assemblyline/machine/TileEntityDetector.java index 7610e7a2..ed7338a9 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityDetector.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityDetector.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java b/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java index 3bbe46d8..9fb6dc68 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityRejector.java b/src/com/builtbroken/assemblyline/machine/TileEntityRejector.java index ac19990e..98a283e1 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityRejector.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityRejector.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java b/src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java index 63ce46df..a772136c 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/TileEntitySink.java b/src/com/builtbroken/assemblyline/machine/TileEntitySink.java index 9f13d3f9..642499a5 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntitySink.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntitySink.java @@ -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 diff --git a/src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java b/src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java index 64897276..f6a65514 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityTank.java b/src/com/builtbroken/assemblyline/machine/TileEntityTank.java index 4b018d68..3871e21d 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityTank.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityTank.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java b/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java index 66d46583..06a94325 100644 --- a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java +++ b/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java b/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java index 9f303ea7..5bdef630 100644 --- a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java +++ b/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java b/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java index 6f119e66..9154ac5f 100644 --- a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java +++ b/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java b/src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java index f8ed01b0..8fe6ea31 100644 --- a/src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java +++ b/src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java b/src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java index c20392b8..b0b1c1b0 100644 --- a/src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java +++ b/src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java b/src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java index cc7fa528..735d9bd5 100644 --- a/src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java +++ b/src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java b/src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java index 2ad58164..2323bfbd 100644 --- a/src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java +++ b/src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java b/src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java index 9c530309..298a3a8c 100644 --- a/src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java +++ b/src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java b/src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java index f6976986..400f15ee 100644 --- a/src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java +++ b/src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java @@ -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 * diff --git a/src/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java b/src/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java index b08c26c2..1e8a8d0f 100644 --- a/src/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java +++ b/src/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java @@ -17,8 +17,8 @@ import net.minecraft.world.World; import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.assemblyline.client.render.RenderAdvancedHopper; 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java b/src/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java index 25a82c24..00eb6bd7 100644 --- a/src/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java +++ b/src/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java @@ -3,7 +3,7 @@ package com.builtbroken.assemblyline.machine.red; import net.minecraft.block.material.Material; import com.builtbroken.assemblyline.AssemblyLine; -import com.dark.prefab.BlockMachine; +import com.builtbroken.minecraft.prefab.BlockMachine; /** This will be a piston that can extend from 1 - 20 depending on teir and user settings * diff --git a/src/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java b/src/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java index 1b015bbe..2966ef3c 100644 --- a/src/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java +++ b/src/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java @@ -10,8 +10,8 @@ import universalelectricity.core.vector.Vector3; import com.builtbroken.assemblyline.imprinter.ItemImprinter; import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; -import com.dark.helpers.DarksHelper; -import com.dark.helpers.InvInteractionHelper; +import com.builtbroken.minecraft.helpers.DarksHelper; +import com.builtbroken.minecraft.helpers.InvInteractionHelper; /** Advanced version of the hopper with features such as redstone control, sorting, filtering, and * crate version. diff --git a/src/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java b/src/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java index 66145e31..dc83e50a 100644 --- a/src/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java +++ b/src/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.vector.Vector3; -import com.dark.interfaces.IMultiBlock; -import com.dark.prefab.TileEntityMachine; +import com.builtbroken.minecraft.interfaces.IMultiBlock; +import com.builtbroken.minecraft.prefab.TileEntityMachine; public class TileEntityPistonPlus extends TileEntityMachine implements IMultiBlock { diff --git a/src/dark/api/events/MachineMiningEvent.java b/src/dark/api/events/MachineMiningEvent.java deleted file mode 100644 index 1ba252b5..00000000 --- a/src/dark/api/events/MachineMiningEvent.java +++ /dev/null @@ -1,79 +0,0 @@ -package dark.api.events; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.Cancelable; -import net.minecraftforge.event.Event; -import universalelectricity.core.vector.Vector3; - -public class MachineMiningEvent extends Event -{ - public final World world; - public final Vector3 spot; - public final TileEntity machine; - - public MachineMiningEvent(World world, Vector3 spot, TileEntity machine) - { - this.world = world; - this.spot = spot; - this.machine = machine; - } - - @Cancelable - public static class PreMine extends MachineMiningEvent - { - public PreMine(World world, Vector3 spot, TileEntity machine) - { - super(world, spot, machine); - } - } - - public static class MiningDrop extends MachineMiningEvent - { - List items; - - public MiningDrop(World world, Vector3 spot, TileEntity machine, List items) - { - super(world, spot, machine); - this.items = items; - } - } - - public static class PostMine extends MachineMiningEvent - { - public PostMine(World world, Vector3 spot, TileEntity machine) - { - super(world, spot, machine); - } - } - - public static boolean doMachineMiningCheck(World world, Vector3 target, TileEntity machine) - { - Block block = Block.blocksList[target.getBlockID(world)]; - - return block != null && target.getTileEntity(world) == null && !block.isAirBlock(world, target.intX(), target.intY(), target.intZ()) && block.getBlockHardness(world, target.intX(), target.intY(), target.intZ()) >= 0; - - } - - public static List getItemsMined(World world, Vector3 target, TileEntity machine) - { - Block block = Block.blocksList[target.getBlockID(world)]; - if (block != null) - { - List items = block.getBlockDropped(world, target.intX(), target.intY(), target.intZ(), target.getBlockMetadata(world), 1); - if (items != null) - { - MiningDrop event = new MiningDrop(world, target, machine, items); - MinecraftForge.EVENT_BUS.post(event); - items = event.items; - return items; - } - } - return null; - } -} diff --git a/src/dark/machines/CommonProxy.java b/src/dark/machines/CommonProxy.java deleted file mode 100644 index f08479a3..00000000 --- a/src/dark/machines/CommonProxy.java +++ /dev/null @@ -1,77 +0,0 @@ -package dark.machines; - -import java.awt.Color; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; -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 -{ - public static final int GUI_COAL_GEN = 0, GUI_FUEL_GEN = 1, GUI_FURNACE_ELEC = 2, GUI_BATTERY_BOX = 3; - - public void preInit() - { - // TODO Auto-generated method stub - - } - - public void init() - { - // TODO Auto-generated method stub - - } - - public void postInit() - { - // TODO Auto-generated method stub - - } - - /** Renders a laser beam from one power to another by a set color for a set time - * - * @param world - world this laser is to be rendered in - * @param position - start vector3 - * @param target - end vector3 - * @param color - color of the beam - * @param age - life of the beam in 1/20 secs */ - public void renderBeam(World world, Vector3 position, Vector3 target, Color color, int age) - { - PacketManagerEffects.sendClientLaserEffect(world, position, target, color, age); - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - - return null; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - if (tileEntity instanceof TileEntitySteamGen) - { - return new ContainerCoalGenerator(player.inventory, ((TileEntitySteamGen) tileEntity)); - } - else if (ID == GUI_BATTERY_BOX && tileEntity instanceof TileEntityBatteryBox) - { - return new ContainerBatteryBox(player.inventory, (TileEntityBatteryBox) tileEntity); - } - } - - return null; - } - -} diff --git a/src/dark/machines/CoreMachine.java b/src/dark/machines/CoreMachine.java deleted file mode 100644 index d3853a0d..00000000 --- a/src/dark/machines/CoreMachine.java +++ /dev/null @@ -1,252 +0,0 @@ -package dark.machines; - -import java.io.File; -import java.util.Arrays; - -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.fluids.FluidRegistry; -import universalelectricity.prefab.TranslationHelper; -import universalelectricity.prefab.ore.OreGenReplaceStone; -import universalelectricity.prefab.ore.OreGenerator; - -import com.dark.CoreRegistry; -import com.dark.DarkCore; -import com.dark.fluid.EnumGas; -import com.dark.network.PacketDataWatcher; -import com.dark.network.PacketHandler; -import com.dark.prefab.ItemBlockHolder; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.Metadata; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; -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 cpw.mods.fml.relauncher.Side; -import dark.machines.blocks.BlockGasOre; -import dark.machines.blocks.BlockOre; -import dark.machines.blocks.BlockOre.OreData; -import dark.machines.blocks.GasOreGenerator; -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.ModPrefab; -import dark.machines.prefab.entities.EntityTestCar; -import dark.machines.prefab.entities.ItemVehicleSpawn; -import dark.machines.transmit.BlockWire; -import dark.machines.transmit.ItemBlockWire; - -/** @author HangCow, DarkGuardsman */ -@Mod(modid = CoreMachine.MOD_ID, name = CoreMachine.MOD_NAME, version = CoreMachine.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true) -@NetworkMod(channels = { CoreMachine.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) -public class CoreMachine extends ModPrefab -{ - // @Mod Prerequisites - public static final String MAJOR_VERSION = "@MAJOR@"; - public static final String MINOR_VERSION = "@MINOR@"; - public static final String REVIS_VERSION = "@REVIS@"; - public static final String BUILD_VERSION = "@BUILD@"; - public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION; - - // @Mod - public static final String MOD_ID = "DarkCore"; - public static final String MOD_NAME = "CoreMachine"; - - @SidedProxy(clientSide = "dark.machines.client.ClientProxy", serverSide = "dark.machines.CommonProxy") - public static CommonProxy proxy; - - public static final String CHANNEL = DarkCore.CHANNEL; - - @Metadata(CoreMachine.MOD_ID) - public static ModMetadata meta; - - /** Main config file */ - public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "Dark/TheDarkMachine.cfg")); - private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" }; - /** Can over pressure of devices do area damage */ - public static boolean overPressureDamage, zeroRendering, zeroAnimation, zeroGraphics; - - @Instance(MOD_ID) - private static CoreMachine instance; - - public static CoreRecipeLoader recipeLoader; - - public static CoreMachine getInstance() - { - if (instance == null) - { - instance = new CoreMachine(); - } - return instance; - } - - @EventHandler - @Override - public void preInit(FMLPreInitializationEvent event) - { - instance = this; - super.preInit(event); - NetworkRegistry.instance().registerGuiHandler(this, proxy); - MinecraftForge.EVENT_BUS.register(PacketDataWatcher.instance); - proxy.preInit(); - } - - @EventHandler - @Override - public void init(FMLInitializationEvent event) - { - super.init(event); - 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 (CoreRecipeLoader.blockGas != null) - { - EnumGas.NATURAL_GAS.getGas().setBlockID(CoreRecipeLoader.blockGas); - } - if (CoreRecipeLoader.blockGas != null) - { - GameRegistry.registerWorldGenerator(new GasOreGenerator()); - } - if (CoreRecipeLoader.blockOre != null) - { - for (OreData data : OreData.values()) - { - if (data.doWorldGen) - { - OreGenReplaceStone gen = data.getGeneratorSettings(); - if (gen != null) - { - OreGenerator.addOre(gen); - } - } - } - } - - FMLLog.info(" Loaded: " + TranslationHelper.loadLanguages(DarkCore.LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages."); - proxy.init(); - } - - @EventHandler - @Override - public void postInit(FMLPostInitializationEvent event) - { - super.postInit(event); - proxy.postInit(); - } - - @Override - public void registerObjects() - { - if (recipeLoader == null) - { - recipeLoader = new CoreRecipeLoader(); - } - /* CONFIGS */ - CONFIGURATION.load(); - - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - { - CoreMachine.zeroAnimation = CONFIGURATION.get("Graphics", "DisableAllAnimation", false, "Disables active animations by any non-active models").getBoolean(false); - CoreMachine.zeroRendering = CONFIGURATION.get("Graphics", "DisableAllRendering", false, "Replaces all model renderers with single block forms").getBoolean(false); - CoreMachine.zeroGraphics = CONFIGURATION.get("Graphics", "DisableAllGraphics", false, "Disables extra effects that models and renders have. Such as particles, and text").getBoolean(false); - } - /* BLOCKS */ - CoreRecipeLoader.blockSteamGen = CoreRegistry.createNewBlock("DMBlockSteamMachine", CoreMachine.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class); - CoreRecipeLoader.blockOre = CoreRegistry.createNewBlock("DMBlockOre", CoreMachine.MOD_ID, BlockOre.class, ItemBlockOre.class); - CoreRecipeLoader.blockWire = CoreRegistry.createNewBlock("DMBlockWire", CoreMachine.MOD_ID, BlockWire.class, ItemBlockWire.class); - CoreRecipeLoader.blockDebug = CoreRegistry.createNewBlock("DMBlockDebug", CoreMachine.MOD_ID, BlockDebug.class, ItemBlockHolder.class); - CoreRecipeLoader.blockStainGlass = CoreRegistry.createNewBlock("DMBlockStainedGlass", CoreMachine.MOD_ID, BlockColorGlass.class, ItemBlockColored.class); - CoreRecipeLoader.blockColorSand = CoreRegistry.createNewBlock("DMBlockColorSand", CoreMachine.MOD_ID, BlockColorSand.class, ItemBlockColored.class); - CoreRecipeLoader.blockBasalt = CoreRegistry.createNewBlock("DMBlockBasalt", CoreMachine.MOD_ID, BlockBasalt.class, ItemBlockColored.class); - CoreRecipeLoader.blockGlowGlass = CoreRegistry.createNewBlock("DMBlockGlowGlass", CoreMachine.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class); - CoreRecipeLoader.blockSolar = CoreRegistry.createNewBlock("DMBlockSolar", CoreMachine.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class); - CoreRecipeLoader.blockGas = CoreRegistry.createNewBlock("DMBlockGas", CoreMachine.MOD_ID, BlockGasOre.class, ItemBlockHolder.class); - CoreRecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", CoreMachine.MOD_ID, BlockEnergyStorage.class, ItemBlockEnergyStorage.class); - - /* ITEMS */ - CoreRecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", CoreMachine.MOD_ID, ItemReadoutTools.class, true); - CoreRecipeLoader.battery = CoreRegistry.createNewItem("DMItemBattery", CoreMachine.MOD_ID, ItemBattery.class, true); - CoreRecipeLoader.wrench = CoreRegistry.createNewItem("DMWrench", CoreMachine.MOD_ID, ItemWrench.class, true); - CoreRecipeLoader.itemGlowingSand = CoreRegistry.createNewItem("DMItemGlowingSand", CoreMachine.MOD_ID, ItemColoredDust.class, true); - CoreRecipeLoader.itemDiggingTool = CoreRegistry.createNewItem("ItemDiggingTools", CoreMachine.MOD_ID, ItemCommonTool.class, true); - CoreRecipeLoader.itemVehicleTest = CoreRegistry.createNewItem("ItemVehicleTest", CoreMachine.MOD_ID, ItemVehicleSpawn.class, true); - CONFIGURATION.save(); - - } - - @Override - public void loadModMeta() - { - /* MCMOD.INFO FILE BUILDER? */ - meta.modId = MOD_ID; - meta.name = MOD_NAME; - meta.description = "Main mod for several of the mods created by DarkGuardsman and his team. Adds basic features, functions, ores, items, and blocks"; - meta.url = "http://www.universalelectricity.com/coremachine"; - - meta.logoFile = DarkCore.TEXTURE_DIRECTORY + "GP_Banner.png"; - meta.version = VERSION; - meta.authorList = Arrays.asList(new String[] { "DarkGuardsman", "HangCow", "Elrath18", "Archadia" }); - meta.credits = "Please see the website."; - meta.autogenerated = false; - } - - @ForgeSubscribe - public void onWorldSave(WorldEvent.Save event) - { - //SaveManager.save(!event.world.isRemote); - } - - @EventHandler - public void serverStopping(FMLServerStoppingEvent event) - { - //SaveManager.save(true); - } - - @Override - public String getDomain() - { - return "dark"; - } - - @Override - public void loadRecipes() - { - if (recipeLoader == null) - { - recipeLoader = new CoreRecipeLoader(); - } - recipeLoader.loadRecipes(); - } - -} diff --git a/src/dark/machines/CoreRecipeLoader.java b/src/dark/machines/CoreRecipeLoader.java deleted file mode 100644 index 275ca009..00000000 --- a/src/dark/machines/CoreRecipeLoader.java +++ /dev/null @@ -1,147 +0,0 @@ -package dark.machines; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import com.dark.EnumMaterial; -import com.dark.EnumOrePart; -import com.dark.helpers.ColorCode; -import com.dark.interfaces.IToolReadOut.EnumTools; -import com.dark.prefab.RecipeLoader; - -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 CoreRecipeLoader extends RecipeLoader -{ - - /* BLOCKS */ - 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; - - /* ITEMS */ - public static Item battery; - public static Item wrench; - - public static Item itemGlowingSand; - public static Item itemDiggingTool; - public static Item itemVehicleTest; - public static boolean debugOreItems = false; - public static Item itemTool; - - @Override - public void loadRecipes() - { - super.loadRecipes(); - 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))); - } - } - } - } - - public void loadStainGlass() - { - 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); - } - - } - - -} diff --git a/src/dark/machines/PacketManagerEffects.java b/src/dark/machines/PacketManagerEffects.java deleted file mode 100644 index 8fa46c52..00000000 --- a/src/dark/machines/PacketManagerEffects.java +++ /dev/null @@ -1,66 +0,0 @@ -package dark.machines; - -import java.awt.Color; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; - -import com.dark.DarkCore; -import com.dark.network.IPacketManager; -import com.dark.network.PacketHandler; -import com.google.common.io.ByteArrayDataInput; - -import cpw.mods.fml.common.network.Player; - -public class PacketManagerEffects implements IPacketManager -{ - static int packetID = 0; - - @Override - public int getID() - { - return packetID; - } - - @Override - public void setID(int maxID) - { - packetID = maxID; - } - - @Override - public void handlePacket(INetworkManager network, Packet250CustomPayload packet, Player player, ByteArrayDataInput data) - { - try - { - World world = ((EntityPlayer) player).worldObj; - String effectName = data.readUTF(); - if (world != null) - { - if (effectName.equalsIgnoreCase("laser")) - { - System.out.println("Received laser packet"); - CoreMachine.proxy.renderBeam(world, PacketHandler.readVector3(data), PacketHandler.readVector3(data), new Color(data.readInt(), data.readInt(), data.readInt()), data.readInt()); - } - } - } - catch (Exception e) - { - System.out.println("[CoreMachine] Error reading packet for effect rendering"); - e.printStackTrace(); - } - - } - - public static void sendClientLaserEffect(World world, Vector3 position, Vector3 target, Color color, int age) - { - Packet packet = PacketHandler.instance().getPacketWithID(DarkCore.CHANNEL, packetID, "laser", position, target, color.getRed(), color.getBlue(), color.getGreen(), age); - PacketHandler.instance().sendPacketToClients(packet, world, position, position.distance(target)); - System.out.println("Sent laser render packet to client"); - } - -} diff --git a/src/dark/machines/client/ClientProxy.java b/src/dark/machines/client/ClientProxy.java deleted file mode 100644 index 99f64324..00000000 --- a/src/dark/machines/client/ClientProxy.java +++ /dev/null @@ -1,72 +0,0 @@ -package dark.machines.client; - -import java.awt.Color; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; - -import com.dark.DarkCore; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CommonProxy; -import dark.machines.client.gui.GuiBatteryBox; -import dark.machines.client.renders.BlockRenderingHandler; -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 -{ - - /** Renders a laser beam from one power to another by a set color for a set time - * - * @param world - world this laser is to be rendered in - * @param position - start vector3 - * @param target - end vector3 - * @param color - color of the beam - * @param age - life of the beam in 1/20 secs */ - @Override - public void renderBeam(World world, Vector3 position, Vector3 target, Color color, int age) - { - if (world.isRemote || FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - { - FMLClientHandler.instance().getClient().effectRenderer.addEffect(new FXBeam(world, position, target, color, DarkCore.TEXTURE_DIRECTORY + "", age)); - } - } - - @Override - public void preInit() - { - RenderingRegistry.registerEntityRenderingHandler(EntityTestCar.class, new RenderTestCar()); - } - - @Override - public void init() - { - RenderingRegistry.registerBlockHandler(new BlockRenderingHandler()); - - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - if (ID == GUI_BATTERY_BOX && tileEntity instanceof TileEntityBatteryBox) - { - return new GuiBatteryBox(player.inventory, (TileEntityBatteryBox) tileEntity); - } - } - - return null; - } -} diff --git a/src/dark/machines/client/Effects.java b/src/dark/machines/client/Effects.java deleted file mode 100644 index 3185332d..00000000 --- a/src/dark/machines/client/Effects.java +++ /dev/null @@ -1,42 +0,0 @@ -package dark.machines.client; - -import net.minecraft.entity.Entity; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; - -public class Effects -{ - public static void drawParticleStreamTo(World world, Vector3 start, Vector3 end) - { - - } - - public static void drawParticleStreamTo(Entity shooter, World world, double x, double y, double z) - { - Vec3 direction = shooter.getLookVec().normalize(); - double scale = 1.0; - double xoffset = 1.3f; - double yoffset = -.2; - double zoffset = 0.3f; - Vec3 horzdir = direction.normalize(); - horzdir.yCoord = 0; - horzdir = horzdir.normalize(); - double cx = shooter.posX + direction.xCoord * xoffset - direction.yCoord * horzdir.xCoord * yoffset - horzdir.zCoord * zoffset; - double cy = shooter.posY + shooter.getEyeHeight() + direction.yCoord * xoffset + (1 - Math.abs(direction.yCoord)) * yoffset; - double cz = shooter.posZ + direction.zCoord * xoffset - direction.yCoord * horzdir.zCoord * yoffset + horzdir.xCoord * zoffset; - double dx = x - cx; - double dy = y - cy; - double dz = z - cz; - double ratio = Math.sqrt(dx * dx + dy * dy + dz * dz); - int i = 0; - while (Math.abs(cx - x) > Math.abs(dx / ratio) && i < 100) - { - world.spawnParticle("townaura", cx, cy, cz, 0.0D, 0.0D, 0.0D); - cx += dx * 0.1 / ratio; - cy += dy * 0.1 / ratio; - cz += dz * 0.1 / ratio; - i++; - } - } -} diff --git a/src/dark/machines/client/FXBeam.java b/src/dark/machines/client/FXBeam.java deleted file mode 100644 index 6d6a3d59..00000000 --- a/src/dark/machines/client/FXBeam.java +++ /dev/null @@ -1,241 +0,0 @@ -package dark.machines.client; - -import java.awt.Color; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - -import universalelectricity.core.vector.Vector3; - -import com.dark.DarkCore; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** Based off Thaumcraft's Beam Renderer. - * - * @author Calclavia, Azanor */ -@SideOnly(Side.CLIENT) -public class FXBeam extends EntityFX -{ - double movX = 0.0D, movY = 0.0D, movZ = 0.0D; - - private float length = 0.0F; - - private float rotYaw = 0.0F, rotPitch = 0.0F, rotSpeed = 20; - - private float prevYaw = 0.0F, prevPitch = 0.0F; - - private Vector3 endLocation = new Vector3(); - - private float endModifier = 1.0F; - - /** Reverse rotation */ - private boolean reverse = false; - /** pulse or fade as the life span goes down */ - private boolean pulse = false; - - private float prevSize = 0.0F; - /** beam diameter */ - private float beamD = 0.08f; - - private String texture = DarkCore.TEXTURE_DIRECTORY + ""; - - public FXBeam(World world, Vector3 start, Vector3 end, Color color, String texture, int age, boolean pulse) - { - this(world, start, end, color, texture, age); - this.pulse = pulse; - } - - public FXBeam(World world, Vector3 start, Vector3 end, Color color, String texture, int age) - { - super(world, start.x, start.y, start.z, 0.0D, 0.0D, 0.0D); - - this.setRGB(color); - - this.texture = texture; - - this.setSize(0.02F, 0.02F); - this.noClip = true; - - this.motionX = 0.0D; - this.motionY = 0.0D; - this.motionZ = 0.0D; - - this.endLocation = end; - float xd = (float) (this.posX - this.endLocation.x); - float yd = (float) (this.posY - this.endLocation.y); - float zd = (float) (this.posZ - this.endLocation.z); - this.length = (float) new Vector3(this).distance(this.endLocation); - double var7 = MathHelper.sqrt_double(xd * xd + zd * zd); - this.rotYaw = ((float) (Math.atan2(xd, zd) * 180.0D / 3.141592653589793D)); - this.rotPitch = ((float) (Math.atan2(yd, var7) * 180.0D / 3.141592653589793D)); - this.prevYaw = this.rotYaw; - this.prevPitch = this.rotPitch; - - this.particleMaxAge = age; - - /** Sets the particle age based on distance. */ - EntityLivingBase renderentity = Minecraft.getMinecraft().renderViewEntity; - int visibleDistance = 50; - - if (!Minecraft.getMinecraft().gameSettings.fancyGraphics) - { - visibleDistance = 25; - } - if (renderentity.getDistance(this.posX, this.posY, this.posZ) > visibleDistance) - { - this.particleMaxAge = 0; - } - } - - @Override - public void onUpdate() - { - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - - this.prevYaw = this.rotYaw; - this.prevPitch = this.rotPitch; - - float deltaX = (float) (this.posX - this.endLocation.x); - float deltaY = (float) (this.posY - this.endLocation.y); - float deltaZ = (float) (this.posZ - this.endLocation.z); - - this.length = MathHelper.sqrt_float(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ); - - double xzMag = MathHelper.sqrt_double(deltaX * deltaX + deltaZ * deltaZ); - - this.rotYaw = ((float) (Math.atan2(deltaX, deltaZ) * 180.0D / 3.141592653589793D)); - this.rotPitch = ((float) (Math.atan2(deltaY, xzMag) * 180.0D / 3.141592653589793D)); - - if (this.particleAge++ >= this.particleMaxAge) - { - setDead(); - } - } - - public void setRGB(float r, float g, float b) - { - this.particleRed = r; - this.particleGreen = g; - this.particleBlue = b; - } - - public void setRGB(Color color) - { - this.particleRed = color.getRed(); - this.particleGreen = color.getGreen(); - this.particleBlue = color.getBlue(); - } - - @Override - public void renderParticle(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) - { - //Clear - tessellator.draw(); - GL11.glPushMatrix(); - - //Start drawing - try - { - float var9 = 1.0F; - float slide = this.worldObj.getTotalWorldTime(); - float rot = this.worldObj.provider.getWorldTime() % (360 / this.rotSpeed) * this.rotSpeed + this.rotSpeed * f; - - float size = 1.0F; - float alphaColor = 0.5F; - - if (this.pulse) - { - size = Math.min(this.particleAge / 4.0F, 1.0F); - size = this.prevSize + (size - this.prevSize) * f; - if ((this.particleMaxAge - this.particleAge <= 4)) - { - alphaColor = 0.5F - (4 - (this.particleMaxAge - this.particleAge)) * 0.1F; - } - - } - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(this.texture)); - - GL11.glTexParameterf(3553, 10242, 10497.0F); - GL11.glTexParameterf(3553, 10243, 10497.0F); - - GL11.glDisable(2884); - - float var11 = slide + f; - if (this.reverse) - { - var11 *= -1.0F; - } - float var12 = -var11 * 0.2F - MathHelper.floor_float(-var11 * 0.1F); - - GL11.glEnable(3042); - GL11.glBlendFunc(770, 1); - GL11.glDepthMask(false); - - float xx = (float) (this.prevPosX + (this.posX - this.prevPosX) * f - interpPosX); - float yy = (float) (this.prevPosY + (this.posY - this.prevPosY) * f - interpPosY); - float zz = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * f - interpPosZ); - GL11.glTranslated(xx, yy, zz); - - float yaw = this.prevYaw + (this.rotYaw - this.prevYaw) * f; - float pitch = this.prevPitch + (this.rotPitch - this.prevPitch) * f; - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(180.0F + yaw, 0.0F, 0.0F, -1.0F); - GL11.glRotatef(pitch, 1.0F, 0.0F, 0.0F); - - double negWidth = -beamD * size; - double posWidth = beamD * size; - //TODO test length without size to see if that will fix length render changes - double negLength = -beamD * size * this.endModifier; - double posLength = beamD * size * this.endModifier; - - GL11.glRotatef(rot, 0.0F, 1.0F, 0.0F); - for (int t = 0; t < 3; t++) - { - double dist = this.length * size * var9; - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = -1.0F + var12 + t / 3.0F; - double uvLength = this.length * size * var9 + var35; - - GL11.glRotatef(60.0F, 0.0F, 1.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.setBrightness(200); - tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, alphaColor); - tessellator.addVertexWithUV(negLength, dist, 0.0D, var33, uvLength); - tessellator.addVertexWithUV(negWidth, 0.0D, 0.0D, var33, var35); - tessellator.addVertexWithUV(posWidth, 0.0D, 0.0D, var31, var35); - tessellator.addVertexWithUV(posLength, dist, 0.0D, var31, uvLength); - tessellator.draw(); - } - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDepthMask(true); - GL11.glDisable(3042); - GL11.glEnable(2884); - - this.prevSize = size; - } - catch (Exception e) - { - e.printStackTrace(); - } - - //Reset - GL11.glPopMatrix(); - tessellator.startDrawingQuads(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("textures/particle/particles.png")); - } -} \ No newline at end of file diff --git a/src/dark/machines/client/gui/GuiBatteryBox.java b/src/dark/machines/client/gui/GuiBatteryBox.java index e6e733db..8f2c6cce 100644 --- a/src/dark/machines/client/gui/GuiBatteryBox.java +++ b/src/dark/machines/client/gui/GuiBatteryBox.java @@ -10,18 +10,18 @@ import org.lwjgl.opengl.GL11; import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; -import com.dark.DarkCore; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.machines.ContainerBatteryBox; import dark.machines.machines.TileEntityBatteryBox; @SideOnly(Side.CLIENT) public class GuiBatteryBox extends GuiContainer { - private static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "battery_box.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, DarkCore.GUI_DIRECTORY + "battery_box.png"); private TileEntityBatteryBox tileEntity; diff --git a/src/dark/machines/client/renders/BlockRenderingHandler.java b/src/dark/machines/client/renders/BlockRenderingHandler.java index 733ec515..b81cac7b 100644 --- a/src/dark/machines/client/renders/BlockRenderingHandler.java +++ b/src/dark/machines/client/renders/BlockRenderingHandler.java @@ -7,15 +7,15 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.dark.DarkCore; +import com.builtbroken.assemblyline.ALRecipeLoader; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreRecipeLoader; -import dark.machines.CoreMachine; import dark.machines.client.models.ModelMachine; import dark.machines.client.models.ModelSolarPanel; @@ -30,14 +30,14 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { GL11.glPushMatrix(); - if (CoreRecipeLoader.blockSolar != null && block.blockID == CoreRecipeLoader.blockSolar.blockID) + if (ALRecipeLoader.blockSolar != null && block.blockID == ALRecipeLoader.blockSolar.blockID) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "solarPanel.png")); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderBlockSolarPanel.TEXTURE); GL11.glTranslatef(0.0F, 1.1F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); solarPanelModel.render(0.0625F); } - else if (CoreRecipeLoader.blockSteamGen != null && block.blockID == CoreRecipeLoader.blockSteamGen.blockID) + else if (ALRecipeLoader.blockSteamGen != null && block.blockID == ALRecipeLoader.blockSteamGen.blockID) { ModelMachine model = RenderSteamGen.getModel(metadata); FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderSteamGen.getTexture(metadata)); diff --git a/src/dark/machines/client/renders/RenderBlockSolarPanel.java b/src/dark/machines/client/renders/RenderBlockSolarPanel.java index bdf8a0db..9d620665 100644 --- a/src/dark/machines/client/renders/RenderBlockSolarPanel.java +++ b/src/dark/machines/client/renders/RenderBlockSolarPanel.java @@ -1,39 +1,34 @@ package dark.machines.client.renders; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.dark.DarkCore; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.models.ModelSolarPanel; @SideOnly(Side.CLIENT) -public class RenderBlockSolarPanel extends RenderTileMachine +public class RenderBlockSolarPanel extends TileEntitySpecialRenderer { - private static final ResourceLocation solarPanelTexture = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SolarPanel.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, DarkCore.MODEL_DIRECTORY + "SolarPanel.png"); public static final ModelSolarPanel model = new ModelSolarPanel(); @Override - public void renderModel(TileEntity tileEntity, double d, double d1, double d2, float f) + public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) { // Texture file - this.bindTexture(this.getTexture(tileEntity.getBlockType().blockID, tileEntity.getBlockMetadata())); + this.bindTexture(TEXTURE); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); model.render(0.0625F); GL11.glPopMatrix(); } - - @Override - public ResourceLocation getTexture(int block, int meta) - { - return solarPanelTexture; - } } \ No newline at end of file diff --git a/src/dark/machines/client/renders/RenderBlockWire.java b/src/dark/machines/client/renders/RenderBlockWire.java index f3cbb0d4..1ec25744 100644 --- a/src/dark/machines/client/renders/RenderBlockWire.java +++ b/src/dark/machines/client/renders/RenderBlockWire.java @@ -2,6 +2,7 @@ package dark.machines.client.renders; import ic2.api.energy.tile.IEnergyAcceptor; import ic2.api.energy.tile.IEnergyTile; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; @@ -13,23 +14,25 @@ import universalelectricity.core.block.IConnector; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerReceptor; + +import com.builtbroken.assemblyline.AssemblyLine; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.models.ModelCopperWire; @SideOnly(Side.CLIENT) -public class RenderBlockWire extends RenderTileMachine +public class RenderBlockWire extends TileEntitySpecialRenderer { - private static final ResourceLocation copperWireTexture = new ResourceLocation(CoreMachine.getInstance().DOMAIN, "textures/models/copperWire.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, "textures/models/copperWire.png"); public static final ModelCopperWire model = new ModelCopperWire(); @Override - public void renderModel(TileEntity tileEntity, double d, double d1, double d2, float f) + public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float f) { // Texture file - this.bindTexture(this.getTexture(tileEntity.getBlockType().blockID, tileEntity.getBlockMetadata())); + this.bindTexture(TEXTURE); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -78,10 +81,4 @@ public class RenderBlockWire extends RenderTileMachine model.renderSide(ForgeDirection.UNKNOWN); GL11.glPopMatrix(); } - - @Override - public ResourceLocation getTexture(int block, int meta) - { - return copperWireTexture; - } } \ No newline at end of file diff --git a/src/dark/machines/client/renders/RenderSteamGen.java b/src/dark/machines/client/renders/RenderSteamGen.java index 03a21585..3ab17a54 100644 --- a/src/dark/machines/client/renders/RenderSteamGen.java +++ b/src/dark/machines/client/renders/RenderSteamGen.java @@ -1,33 +1,34 @@ package dark.machines.client.renders; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.dark.DarkCore; -import com.dark.prefab.TileEntityMachine; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.prefab.TileEntityMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.models.ModelMachine; import dark.machines.client.models.ModelSteamGen; import dark.machines.client.models.ModelSteamTurbine; @SideOnly(Side.CLIENT) -public class RenderSteamGen extends RenderTileMachine +public class RenderSteamGen extends TileEntitySpecialRenderer { public static final ModelSteamTurbine TURBINE_MODEL = new ModelSteamTurbine(); public static final ModelSteamGen STEAM_GEN_MODEL = new ModelSteamGen(); - public static final ResourceLocation TURBINE_TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SmallSteamFan.png"); - public static final ResourceLocation STEAM_GEN_TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SteamGenerator.png"); + public static final ResourceLocation TURBINE_TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, DarkCore.MODEL_DIRECTORY + "SmallSteamFan.png"); + public static final ResourceLocation STEAM_GEN_TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, DarkCore.MODEL_DIRECTORY + "SteamGenerator.png"); private static float rot1 = 0; @Override - public void renderModel(TileEntity tileEntity, double x, double y, double z, float size) + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float size) { int meta = tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); int face = meta % 4; @@ -35,7 +36,7 @@ public class RenderSteamGen extends RenderTileMachine if (model != null) { - bindTexture(this.getTexture(tileEntity.getBlockType().blockID, meta)); + bindTexture(this.getTexture(meta)); rot1 = MathHelper.wrapAngleTo180_float(rot1 + 1); GL11.glPushMatrix(); @@ -112,10 +113,4 @@ public class RenderSteamGen extends RenderTileMachine return null; } - @Override - public ResourceLocation getTexture(int block, int meta) - { - return getTexture(meta); - } - } \ No newline at end of file diff --git a/src/dark/machines/client/renders/RenderTestCar.java b/src/dark/machines/client/renders/RenderTestCar.java index 81cf45c3..5b968415 100644 --- a/src/dark/machines/client/renders/RenderTestCar.java +++ b/src/dark/machines/client/renders/RenderTestCar.java @@ -8,18 +8,18 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.dark.DarkCore; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.models.ModelTestCar; import dark.machines.prefab.entities.EntityAdvanced; @SideOnly(Side.CLIENT) public class RenderTestCar extends Render { - private static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "TestCar.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, DarkCore.MODEL_DIRECTORY + "TestCar.png"); /** instance of ModelBoat for rendering */ protected ModelBase modelBoat; diff --git a/src/dark/machines/client/renders/RenderTileMachine.java b/src/dark/machines/client/renders/RenderTileMachine.java deleted file mode 100644 index d0497d1d..00000000 --- a/src/dark/machines/client/renders/RenderTileMachine.java +++ /dev/null @@ -1,37 +0,0 @@ -package dark.machines.client.renders; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public abstract class RenderTileMachine extends TileEntitySpecialRenderer -{ - - public RenderTileMachine() - { - - } - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float f) - { - this.renderModel(tileEntity, d, d1, d2, f); - } - - public abstract void renderModel(TileEntity tileEntity, double x, double y, double z, float size); - - /** Sudo method for setting the texture for current render - * - * @param name */ - public void bindTextureByName(String domain, String name) - { - this.bindTexture(new ResourceLocation(domain, name)); - } - - /** Gets the texture based on block and metadata mainly used by item/block inv render */ - public abstract ResourceLocation getTexture(int block, int meta); - -} diff --git a/src/dark/machines/deco/BlockBasalt.java b/src/dark/machines/deco/BlockBasalt.java index c56a0741..5263e811 100644 --- a/src/dark/machines/deco/BlockBasalt.java +++ b/src/dark/machines/deco/BlockBasalt.java @@ -8,11 +8,11 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.Icon; -import com.dark.DarkCore; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; public class BlockBasalt extends Block { @@ -38,7 +38,7 @@ public class BlockBasalt extends Block public BlockBasalt() { - super(CoreMachine.CONFIGURATION.getBlock("basalt", DarkCore.getNextID()).getInt(), Material.rock); + super(AssemblyLine.CONFIGURATION.getBlock("basalt", DarkCore.getNextID()).getInt(), Material.rock); this.setCreativeTab(CreativeTabs.tabDecorations); this.setHardness(2f); this.setResistance(2f); @@ -86,7 +86,7 @@ public class BlockBasalt extends Block for (int i = 0; i < BlockBasalt.blockNames.length; ++i) { - this.icons[i] = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + BlockBasalt.blockNames[i]); + this.icons[i] = iconReg.registerIcon(AssemblyLine.PREFIX + BlockBasalt.blockNames[i]); } } diff --git a/src/dark/machines/deco/BlockColorGlass.java b/src/dark/machines/deco/BlockColorGlass.java index 67064683..a4071571 100644 --- a/src/dark/machines/deco/BlockColorGlass.java +++ b/src/dark/machines/deco/BlockColorGlass.java @@ -5,18 +5,18 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import com.dark.DarkCore; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; public class BlockColorGlass extends BlockColored { public BlockColorGlass(String name) { - super(name, CoreMachine.CONFIGURATION.getBlock(name, DarkCore.getNextID()).getInt(), Material.glass); + super(name, AssemblyLine.CONFIGURATION.getBlock(name, DarkCore.getNextID()).getInt(), Material.glass); this.setCreativeTab(CreativeTabs.tabDecorations); this.setHardness(.5f); this.setResistance(.5f); diff --git a/src/dark/machines/deco/BlockColorSand.java b/src/dark/machines/deco/BlockColorSand.java index 6d2bb16d..658763c5 100644 --- a/src/dark/machines/deco/BlockColorSand.java +++ b/src/dark/machines/deco/BlockColorSand.java @@ -7,16 +7,15 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.World; -import com.dark.DarkCore; - -import dark.machines.CoreMachine; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; //TODO fix instant falling sand public class BlockColorSand extends BlockColored { public BlockColorSand() { - super("colorSand", CoreMachine.CONFIGURATION.getBlock("colorSand", DarkCore.getNextID()).getInt(), Material.sand); + super("colorSand", AssemblyLine.CONFIGURATION.getBlock("colorSand", DarkCore.getNextID()).getInt(), Material.sand); this.setCreativeTab(CreativeTabs.tabDecorations); this.setHardness(1f); this.setResistance(.5f); diff --git a/src/dark/machines/deco/BlockColored.java b/src/dark/machines/deco/BlockColored.java index ed98a105..a7e075a4 100644 --- a/src/dark/machines/deco/BlockColored.java +++ b/src/dark/machines/deco/BlockColored.java @@ -2,8 +2,6 @@ package dark.machines.deco; import java.util.List; -import com.dark.helpers.ColorCode; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -11,9 +9,12 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; + +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.helpers.ColorCode; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; /** Prefab class to make any block have 16 separate color instances similar to wool block * @@ -65,7 +66,7 @@ public class BlockColored extends Block { if (colorized) { - this.blockIcon = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + this.getUnlocalizedName().replace("tile.", "")); + this.blockIcon = iconReg.registerIcon(AssemblyLine.PREFIX + this.getUnlocalizedName().replace("tile.", "")); } else { @@ -73,7 +74,7 @@ public class BlockColored extends Block for (int i = 0; i < this.icons.length; ++i) { - this.icons[i] = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + ColorCode.get(~i & 15).name + this.getUnlocalizedName().replace("tile.", "")); + this.icons[i] = iconReg.registerIcon(AssemblyLine.PREFIX + ColorCode.get(~i & 15).name + this.getUnlocalizedName().replace("tile.", "")); } } } diff --git a/src/dark/machines/deco/ItemBlockColored.java b/src/dark/machines/deco/ItemBlockColored.java index f127571a..f3bc6905 100644 --- a/src/dark/machines/deco/ItemBlockColored.java +++ b/src/dark/machines/deco/ItemBlockColored.java @@ -1,11 +1,10 @@ package dark.machines.deco; -import com.dark.helpers.ColorCode; - import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import dark.machines.CoreMachine; + +import com.builtbroken.minecraft.helpers.ColorCode; public class ItemBlockColored extends ItemBlock { diff --git a/src/dark/machines/generators/BlockSmallSteamGen.java b/src/dark/machines/generators/BlockSmallSteamGen.java index b87114cc..7d15e81f 100644 --- a/src/dark/machines/generators/BlockSmallSteamGen.java +++ b/src/dark/machines/generators/BlockSmallSteamGen.java @@ -15,13 +15,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import universalelectricity.core.UniversalElectricity; +import com.builtbroken.assemblyline.AssemblyLine; 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.renders.BlockRenderingHandler; import dark.machines.client.renders.RenderSteamGen; @@ -29,14 +29,14 @@ import dark.machines.client.renders.RenderSteamGen; * A) the generator B) the collector The generator creates the steam and burns the fuel. The * collector uses the steam to generate a small amount of constant power. This setup is not very * powerful but is easy to create and doesn't take much to keep running - * + * * @author DarkGuardsman */ public class BlockSmallSteamGen extends BlockMachine { public BlockSmallSteamGen() { - super(CoreMachine.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine); + super(AssemblyLine.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine); this.setStepSound(soundMetalFootstep); this.setCreativeTab(IndustryTabs.tabIndustrial()); } diff --git a/src/dark/machines/generators/BlockSolarPanel.java b/src/dark/machines/generators/BlockSolarPanel.java index 38f6e623..baba776b 100644 --- a/src/dark/machines/generators/BlockSolarPanel.java +++ b/src/dark/machines/generators/BlockSolarPanel.java @@ -11,13 +11,13 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.core.UniversalElectricity; +import com.builtbroken.assemblyline.AssemblyLine; 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.renders.BlockRenderingHandler; import dark.machines.client.renders.RenderBlockSolarPanel; @@ -30,7 +30,7 @@ public class BlockSolarPanel extends BlockMachine public BlockSolarPanel() { - super(CoreMachine.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine); + super(AssemblyLine.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine); this.setBlockBounds(0, 0, 0, 1f, .6f, 1f); this.setCreativeTab(IndustryTabs.tabIndustrial()); } diff --git a/src/dark/machines/generators/TileEntitySteamGen.java b/src/dark/machines/generators/TileEntitySteamGen.java index 61fb42cc..d9018b60 100644 --- a/src/dark/machines/generators/TileEntitySteamGen.java +++ b/src/dark/machines/generators/TileEntitySteamGen.java @@ -1,7 +1,5 @@ package dark.machines.generators; -import com.dark.prefab.TileEntityMachine; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -12,6 +10,8 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.builtbroken.minecraft.prefab.TileEntityMachine; + /** Simple steam gen designed to burn items to create steam to power a steam device directly above * it. Doesn't actually make steam fluid but rather simple functions. The machines above it will * need to call to this machines and do a check for steam. If this machines is creating steam then diff --git a/src/dark/machines/generators/TileEntitySteamPiston.java b/src/dark/machines/generators/TileEntitySteamPiston.java index 893407ad..ce804f8e 100644 --- a/src/dark/machines/generators/TileEntitySteamPiston.java +++ b/src/dark/machines/generators/TileEntitySteamPiston.java @@ -2,11 +2,11 @@ package dark.machines.generators; import java.util.EnumSet; -import com.dark.prefab.TileEntityEnergyMachine; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; + public class TileEntitySteamPiston extends TileEntityEnergyMachine { protected float wattPerSteam = 32.0f; diff --git a/src/dark/machines/items/EnumTool.java b/src/dark/machines/items/EnumTool.java index 63b0f945..ca013630 100644 --- a/src/dark/machines/items/EnumTool.java +++ b/src/dark/machines/items/EnumTool.java @@ -3,14 +3,15 @@ package dark.machines.items; import java.util.ArrayList; import java.util.List; -import com.dark.EnumMaterial; - import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; + +import com.builtbroken.assemblyline.ALRecipeLoader; +import com.builtbroken.minecraft.EnumMaterial; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreRecipeLoader; /** Enum to store tools that can be created from the material sheet. * @@ -88,9 +89,9 @@ public enum EnumTool public ItemStack getTool(EnumMaterial mat) { ItemStack stack = null; - if (CoreRecipeLoader.itemDiggingTool instanceof ItemCommonTool) + if (ALRecipeLoader.itemDiggingTool instanceof ItemCommonTool) { - stack = new ItemStack(CoreRecipeLoader.itemDiggingTool.itemID, 1, (mat.ordinal() * toolCountPerMaterial) + this.ordinal()); + stack = new ItemStack(ALRecipeLoader.itemDiggingTool.itemID, 1, (mat.ordinal() * toolCountPerMaterial) + this.ordinal()); } return stack; } diff --git a/src/dark/machines/items/ItemBattery.java b/src/dark/machines/items/ItemBattery.java index b67fb9fa..2543d907 100644 --- a/src/dark/machines/items/ItemBattery.java +++ b/src/dark/machines/items/ItemBattery.java @@ -6,23 +6,23 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.core.item.ItemElectric; -import com.dark.DarkCore; -import com.dark.IndustryTabs; -import com.dark.IExtraInfo.IExtraItemInfo; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; +import com.builtbroken.minecraft.IndustryTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; /** Simple battery to store energy - * + * * @author DarkGuardsman */ public class ItemBattery extends ItemElectric implements IExtraItemInfo { public ItemBattery() { - super(CoreMachine.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt()); - this.setUnlocalizedName(CoreMachine.getInstance().PREFIX + "Battery"); + super(AssemblyLine.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt()); + this.setUnlocalizedName(AssemblyLine.PREFIX + "Battery"); this.setCreativeTab(IndustryTabs.tabIndustrial()); } diff --git a/src/dark/machines/items/ItemBlockOre.java b/src/dark/machines/items/ItemBlockOre.java index db2cc567..93a1ab25 100644 --- a/src/dark/machines/items/ItemBlockOre.java +++ b/src/dark/machines/items/ItemBlockOre.java @@ -2,9 +2,10 @@ package dark.machines.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import dark.machines.CoreMachine; -import dark.machines.blocks.BlockOre; -import dark.machines.blocks.BlockOre.OreData; + +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.assemblyline.blocks.BlockOre.OreData; + public class ItemBlockOre extends ItemBlock { @@ -27,7 +28,7 @@ public class ItemBlockOre extends ItemBlock { if (par1ItemStack != null && par1ItemStack.getItemDamage() < OreData.values().length) { - return "tile." + CoreMachine.getInstance().PREFIX + OreData.values()[par1ItemStack.getItemDamage()].name + "Ore"; + return "tile." + AssemblyLine.PREFIX + OreData.values()[par1ItemStack.getItemDamage()].name + "Ore"; } return super.getUnlocalizedName(); } diff --git a/src/dark/machines/items/ItemColoredDust.java b/src/dark/machines/items/ItemColoredDust.java index 0aec88aa..edd2be22 100644 --- a/src/dark/machines/items/ItemColoredDust.java +++ b/src/dark/machines/items/ItemColoredDust.java @@ -7,13 +7,13 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -import com.dark.DarkCore; -import com.dark.helpers.ColorCode; -import com.dark.prefab.ItemBasic; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.helpers.ColorCode; +import com.builtbroken.minecraft.prefab.ItemBasic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; public class ItemColoredDust extends ItemBasic { @@ -22,7 +22,7 @@ public class ItemColoredDust extends ItemBasic public ItemColoredDust() { - super(DarkCore.getNextItemId(), "GlowRefinedSand", CoreMachine.CONFIGURATION); + super(DarkCore.getNextItemId(), "GlowRefinedSand", AssemblyLine.CONFIGURATION); this.setMaxDamage(0); this.setHasSubtypes(true); this.setCreativeTab(CreativeTabs.tabMaterials); @@ -46,7 +46,7 @@ public class ItemColoredDust extends ItemBasic @Override public void registerIcons(IconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "dust"); + this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "dust"); this.theIcon = par1IconRegister.registerIcon("glowingPowder_overlay"); } diff --git a/src/dark/machines/items/ItemCommonTool.java b/src/dark/machines/items/ItemCommonTool.java index ea9be2c6..2e491992 100644 --- a/src/dark/machines/items/ItemCommonTool.java +++ b/src/dark/machines/items/ItemCommonTool.java @@ -31,15 +31,14 @@ import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.oredict.OreDictionary; -import com.dark.DarkCore; -import com.dark.EnumMaterial; -import com.dark.EnumOrePart; -import com.dark.IExtraInfo.IExtraItemInfo; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.EnumMaterial; +import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; /** Flexible tool class that uses NBT to store damage and effect rather than metadata. Metadata * instead is used to store sub items allowing several different tools to exist within the same item @@ -56,7 +55,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo public ItemCommonTool() { - super(CoreMachine.CONFIGURATION.getItem("Items", "CommonTools", DarkCore.getNextItemId()).getInt()); + super(AssemblyLine.CONFIGURATION.getItem("Items", "CommonTools", DarkCore.getNextItemId()).getInt()); this.maxStackSize = 1; this.setCreativeTab(CreativeTabs.tabTools); } @@ -436,7 +435,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo { if (itemStack != null) { - return "item." + CoreMachine.getInstance().PREFIX + EnumTool.getFullName(itemStack.getItemDamage()); + return "item." + AssemblyLine.PREFIX + EnumTool.getFullName(itemStack.getItemDamage()); } else { @@ -476,7 +475,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo if (tool.enabled) { - tool.toolIcons[mat.ordinal()] = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "tool." + mat.simpleName + tool.name); + tool.toolIcons[mat.ordinal()] = iconRegister.registerIcon(AssemblyLine.PREFIX + "tool." + mat.simpleName + tool.name); } } } diff --git a/src/dark/machines/items/ItemReadoutTools.java b/src/dark/machines/items/ItemReadoutTools.java index f0db0447..82c1430d 100644 --- a/src/dark/machines/items/ItemReadoutTools.java +++ b/src/dark/machines/items/ItemReadoutTools.java @@ -20,15 +20,15 @@ import universalelectricity.core.block.IElectricalStorage; import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; -import com.dark.DarkCore; -import com.dark.fluid.FluidHelper; -import com.dark.interfaces.IToolReadOut; -import com.dark.interfaces.IToolReadOut.EnumTools; -import com.dark.prefab.ItemBasic; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.fluid.FluidHelper; +import com.builtbroken.minecraft.interfaces.IToolReadOut; +import com.builtbroken.minecraft.interfaces.IToolReadOut.EnumTools; +import com.builtbroken.minecraft.prefab.ItemBasic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; public class ItemReadoutTools extends ItemBasic { @@ -36,7 +36,7 @@ public class ItemReadoutTools extends ItemBasic public ItemReadoutTools() { - super(DarkCore.getNextItemId(), "DMTools", CoreMachine.CONFIGURATION); + super(DarkCore.getNextItemId(), "DMTools", AssemblyLine.CONFIGURATION); this.setHasSubtypes(true); this.setCreativeTab(CreativeTabs.tabTools); this.setMaxStackSize(1); @@ -47,8 +47,8 @@ public class ItemReadoutTools extends ItemBasic @Override public void registerIcons(IconRegister iconRegister) { - this.pipeGuage = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "readout.PipeGauge"); - this.multiMeter = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "readout.multi-Meter"); + this.pipeGuage = iconRegister.registerIcon(AssemblyLine.PREFIX + "readout.PipeGauge"); + this.multiMeter = iconRegister.registerIcon(AssemblyLine.PREFIX + "readout.multi-Meter"); } @SideOnly(Side.CLIENT) diff --git a/src/dark/machines/items/ItemWrench.java b/src/dark/machines/items/ItemWrench.java index 1453f24e..14321c95 100644 --- a/src/dark/machines/items/ItemWrench.java +++ b/src/dark/machines/items/ItemWrench.java @@ -10,11 +10,10 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.tools.IToolWrench; -import com.dark.DarkCore; -import com.dark.IExtraInfo.IExtraItemInfo; -import com.dark.prefab.ItemBasic; - -import dark.machines.CoreMachine; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; +import com.builtbroken.minecraft.prefab.ItemBasic; public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo { @@ -22,10 +21,10 @@ public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo public ItemWrench() { - super(DarkCore.getNextItemId(), "wrench", CoreMachine.CONFIGURATION); + super(DarkCore.getNextItemId(), "wrench", AssemblyLine.CONFIGURATION); this.setMaxStackSize(1); this.setCreativeTab(CreativeTabs.tabTools); - this.setTextureName(CoreMachine.getInstance().PREFIX + "wrench"); + this.setTextureName(AssemblyLine.PREFIX + "wrench"); } diff --git a/src/dark/machines/machines/BlockDebug.java b/src/dark/machines/machines/BlockDebug.java index 0f3d87a0..f838325a 100644 --- a/src/dark/machines/machines/BlockDebug.java +++ b/src/dark/machines/machines/BlockDebug.java @@ -13,13 +13,13 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; +import com.builtbroken.assemblyline.AssemblyLine; 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; public class BlockDebug extends BlockMachine { @@ -27,7 +27,7 @@ public class BlockDebug extends BlockMachine public BlockDebug() { - super(CoreMachine.CONFIGURATION, "DebugBlock", Material.clay); + super(AssemblyLine.CONFIGURATION, "DebugBlock", Material.clay); this.setCreativeTab(IndustryTabs.tabIndustrial()); } @@ -40,7 +40,7 @@ public class BlockDebug extends BlockMachine { if (block.enabled) { - block.icon = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + block.getTextureName()); + block.icon = iconReg.registerIcon(AssemblyLine.PREFIX + block.getTextureName()); } } } diff --git a/src/dark/machines/machines/BlockEnergyStorage.java b/src/dark/machines/machines/BlockEnergyStorage.java index 93a05442..58f5fae8 100644 --- a/src/dark/machines/machines/BlockEnergyStorage.java +++ b/src/dark/machines/machines/BlockEnergyStorage.java @@ -16,13 +16,12 @@ import universalelectricity.core.UniversalElectricity; import universalelectricity.core.block.IConductor; import universalelectricity.core.vector.Vector3; +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.assemblyline.CommonProxy; import com.builtbroken.common.Pair; -import com.dark.IndustryTabs; -import com.dark.helpers.DarksHelper; -import com.dark.prefab.BlockMachine; - -import dark.machines.CommonProxy; -import dark.machines.CoreMachine; +import com.builtbroken.minecraft.IndustryTabs; +import com.builtbroken.minecraft.helpers.DarksHelper; +import com.builtbroken.minecraft.prefab.BlockMachine; /** Block for energy storage devices * @@ -31,7 +30,7 @@ public class BlockEnergyStorage extends BlockMachine { public BlockEnergyStorage() { - super(CoreMachine.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine); + super(AssemblyLine.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine); this.setCreativeTab(IndustryTabs.tabIndustrial()); } @@ -55,7 +54,7 @@ public class BlockEnergyStorage extends BlockMachine if (!par1World.isRemote) { - par5EntityPlayer.openGui(CoreMachine.getInstance(), CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z); + par5EntityPlayer.openGui(AssemblyLine.instance, CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z); } return true; diff --git a/src/dark/machines/machines/BlockTransformer.java b/src/dark/machines/machines/BlockTransformer.java index 3aa3c76d..ceb31d5a 100644 --- a/src/dark/machines/machines/BlockTransformer.java +++ b/src/dark/machines/machines/BlockTransformer.java @@ -1,18 +1,18 @@ package dark.machines.machines; -import com.dark.IndustryTabs; -import com.dark.prefab.BlockMachine; - import net.minecraft.block.material.Material; import net.minecraftforge.common.Configuration; import universalelectricity.core.UniversalElectricity; -import dark.machines.CoreMachine; + +import com.builtbroken.assemblyline.AssemblyLine; +import com.builtbroken.minecraft.IndustryTabs; +import com.builtbroken.minecraft.prefab.BlockMachine; public class BlockTransformer extends BlockMachine { public BlockTransformer(Configuration config, String blockName, Material material) { - super(CoreMachine.CONFIGURATION, "Transformer", UniversalElectricity.machine); + super(AssemblyLine.CONFIGURATION, "Transformer", UniversalElectricity.machine); this.setCreativeTab(IndustryTabs.tabIndustrial()); } } diff --git a/src/dark/machines/machines/ItemBlockEnergyStorage.java b/src/dark/machines/machines/ItemBlockEnergyStorage.java index d2400858..4a583bb9 100644 --- a/src/dark/machines/machines/ItemBlockEnergyStorage.java +++ b/src/dark/machines/machines/ItemBlockEnergyStorage.java @@ -10,7 +10,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import universalelectricity.core.vector.Vector3; -import dark.machines.CoreRecipeLoader; + +import com.builtbroken.assemblyline.ALRecipeLoader; /** Item version of the enrgy storage block * @@ -73,7 +74,7 @@ public class ItemBlockEnergyStorage extends ItemBlock public static ItemStack getWrenchedBatteryBox(World world, Vector3 vec) { - ItemStack itemStack = new ItemStack(CoreRecipeLoader.blockBatBox); + ItemStack itemStack = new ItemStack(ALRecipeLoader.blockBatBox); TileEntity entity = vec.getTileEntity(world); if (entity instanceof TileEntityBatteryBox) { diff --git a/src/dark/machines/machines/TileEntityBatteryBox.java b/src/dark/machines/machines/TileEntityBatteryBox.java index 75672eda..806e035b 100644 --- a/src/dark/machines/machines/TileEntityBatteryBox.java +++ b/src/dark/machines/machines/TileEntityBatteryBox.java @@ -13,9 +13,9 @@ import universalelectricity.core.grid.IElectricityNetwork; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; -import com.dark.network.PacketHandler; -import com.dark.prefab.EnergyHelper; -import com.dark.prefab.TileEntityEnergyMachine; +import com.builtbroken.minecraft.network.PacketHandler; +import com.builtbroken.minecraft.prefab.EnergyHelper; +import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; diff --git a/src/dark/machines/machines/TileEntityGenerator.java b/src/dark/machines/machines/TileEntityGenerator.java index 66504599..71e9df89 100644 --- a/src/dark/machines/machines/TileEntityGenerator.java +++ b/src/dark/machines/machines/TileEntityGenerator.java @@ -1,10 +1,10 @@ package dark.machines.machines; -import com.dark.prefab.TileEntityEnergyMachine; - import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.electricity.ElectricityPack; +import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; + public abstract class TileEntityGenerator extends TileEntityEnergyMachine { /** Run time left */ diff --git a/src/dark/machines/machines/TileEntityInfFluid.java b/src/dark/machines/machines/TileEntityInfFluid.java index 777f3bda..b5e948fd 100644 --- a/src/dark/machines/machines/TileEntityInfFluid.java +++ b/src/dark/machines/machines/TileEntityInfFluid.java @@ -16,8 +16,8 @@ import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import com.builtbroken.common.lang.TextHelper.TextColor; -import com.dark.fluid.FluidHelper; -import com.dark.interfaces.IBlockActivated; +import com.builtbroken.minecraft.fluid.FluidHelper; +import com.builtbroken.minecraft.interfaces.IBlockActivated; public class TileEntityInfFluid extends TileEntity implements IFluidHandler, IBlockActivated diff --git a/src/dark/machines/machines/TileEntityInfLoad.java b/src/dark/machines/machines/TileEntityInfLoad.java index 3afe6f82..39683873 100644 --- a/src/dark/machines/machines/TileEntityInfLoad.java +++ b/src/dark/machines/machines/TileEntityInfLoad.java @@ -1,9 +1,9 @@ package dark.machines.machines; -import com.dark.prefab.TileEntityEnergyMachine; - import net.minecraftforge.common.ForgeDirection; +import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; + public class TileEntityInfLoad extends TileEntityEnergyMachine { diff --git a/src/dark/machines/machines/TileEntityInfSupply.java b/src/dark/machines/machines/TileEntityInfSupply.java index 8b2f4a7d..8e10bbbf 100644 --- a/src/dark/machines/machines/TileEntityInfSupply.java +++ b/src/dark/machines/machines/TileEntityInfSupply.java @@ -2,10 +2,10 @@ package dark.machines.machines; import java.util.EnumSet; -import com.dark.prefab.TileEntityEnergyMachine; - import net.minecraftforge.common.ForgeDirection; +import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; + public class TileEntityInfSupply extends TileEntityEnergyMachine { diff --git a/src/dark/machines/prefab/ModPrefab.java b/src/dark/machines/prefab/ModPrefab.java index dc9c9e62..063b26a9 100644 --- a/src/dark/machines/prefab/ModPrefab.java +++ b/src/dark/machines/prefab/ModPrefab.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.MinecraftForge; import org.modstats.Modstats; import com.builtbroken.common.Triple; -import com.dark.DarkCore; +import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod.EventHandler; diff --git a/src/dark/machines/prefab/entities/EntityTestCar.java b/src/dark/machines/prefab/entities/EntityTestCar.java index cd6cb47e..dfe0eb85 100644 --- a/src/dark/machines/prefab/entities/EntityTestCar.java +++ b/src/dark/machines/prefab/entities/EntityTestCar.java @@ -1,7 +1,8 @@ package dark.machines.prefab.entities; import net.minecraft.world.World; -import dark.machines.CoreRecipeLoader; + +import com.builtbroken.assemblyline.ALRecipeLoader; public class EntityTestCar extends EntityVehicle { @@ -26,7 +27,7 @@ public class EntityTestCar extends EntityVehicle @Override public void dropAsItem() { - this.dropItemWithOffset(CoreRecipeLoader.itemVehicleTest.itemID, 1, 0.0F); + this.dropItemWithOffset(ALRecipeLoader.itemVehicleTest.itemID, 1, 0.0F); } } diff --git a/src/dark/machines/prefab/entities/EntityVehicle.java b/src/dark/machines/prefab/entities/EntityVehicle.java index a1ed129b..21043bd1 100644 --- a/src/dark/machines/prefab/entities/EntityVehicle.java +++ b/src/dark/machines/prefab/entities/EntityVehicle.java @@ -12,10 +12,10 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import com.dark.interfaces.IControlReceiver; -import com.dark.network.ISimplePacketReceiver; -import com.dark.network.PacketManagerEntity; -import com.dark.network.PacketManagerKeyEvent; +import com.builtbroken.minecraft.interfaces.IControlReceiver; +import com.builtbroken.minecraft.network.ISimplePacketReceiver; +import com.builtbroken.minecraft.network.PacketManagerEntity; +import com.builtbroken.minecraft.network.PacketManagerKeyEvent; import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/dark/machines/prefab/entities/ItemVehicleSpawn.java b/src/dark/machines/prefab/entities/ItemVehicleSpawn.java index 8601168d..e82cb340 100644 --- a/src/dark/machines/prefab/entities/ItemVehicleSpawn.java +++ b/src/dark/machines/prefab/entities/ItemVehicleSpawn.java @@ -13,8 +13,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import com.dark.DarkCore; -import com.dark.IndustryTabs; +import com.builtbroken.minecraft.DarkCore; +import com.builtbroken.minecraft.IndustryTabs; /** Basic item used to spawn a vehicle diff --git a/src/dark/machines/transmit/BlockWire.java b/src/dark/machines/transmit/BlockWire.java index f3663362..069fc1c6 100644 --- a/src/dark/machines/transmit/BlockWire.java +++ b/src/dark/machines/transmit/BlockWire.java @@ -20,13 +20,13 @@ import universalelectricity.core.block.IConductor; import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.tile.TileEntityConductor; +import com.builtbroken.assemblyline.AssemblyLine; 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.machines.CoreMachine; import dark.machines.client.renders.RenderBlockWire; public class BlockWire extends BlockMachine @@ -42,7 +42,7 @@ public class BlockWire extends BlockMachine public BlockWire() { - super(CoreMachine.CONFIGURATION, "DMWire", Material.cloth); + super(AssemblyLine.CONFIGURATION, "DMWire", Material.cloth); this.setStepSound(soundClothFootstep); this.setResistance(0.2F); this.setHardness(0.1f); @@ -54,7 +54,7 @@ public class BlockWire extends BlockMachine @Override public void registerIcons(IconRegister par1IconRegister) { - this.wireIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "CopperWire"); + this.wireIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "CopperWire"); } @Override diff --git a/src/dark/machines/transmit/ItemBlockWire.java b/src/dark/machines/transmit/ItemBlockWire.java index 60ffe7cd..5ce4eb3c 100644 --- a/src/dark/machines/transmit/ItemBlockWire.java +++ b/src/dark/machines/transmit/ItemBlockWire.java @@ -1,9 +1,9 @@ package dark.machines.transmit; -import com.dark.prefab.ItemBlockHolder; - import net.minecraft.util.Icon; -import dark.machines.CoreRecipeLoader; + +import com.builtbroken.assemblyline.ALRecipeLoader; +import com.builtbroken.minecraft.prefab.ItemBlockHolder; public class ItemBlockWire extends ItemBlockHolder { @@ -16,7 +16,7 @@ public class ItemBlockWire extends ItemBlockHolder @Override public Icon getIconFromDamage(int par1) { - return CoreRecipeLoader.blockWire instanceof BlockWire ? ((BlockWire) CoreRecipeLoader.blockWire).wireIcon : CoreRecipeLoader.blockWire.getIcon(0, par1); + return ALRecipeLoader.blockWire instanceof BlockWire ? ((BlockWire) ALRecipeLoader.blockWire).wireIcon : ALRecipeLoader.blockWire.getIcon(0, par1); } } diff --git a/src/dark/machines/transmit/TileEntityWire.java b/src/dark/machines/transmit/TileEntityWire.java index f0721063..30c8a603 100644 --- a/src/dark/machines/transmit/TileEntityWire.java +++ b/src/dark/machines/transmit/TileEntityWire.java @@ -1,9 +1,9 @@ package dark.machines.transmit; -import com.dark.helpers.ColorCode; - import universalelectricity.compatibility.TileEntityUniversalConductor; +import com.builtbroken.minecraft.helpers.ColorCode; + public class TileEntityWire extends TileEntityUniversalConductor { protected int updateTick = 1;