more package rework

src/com/builtbroken/assemblyline/ALRecipeLoader.java

@@ -11,11 +11,18 @@ import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
+import com.builtbroken.assemblyline.blocks.BlockBasalt;
+import com.builtbroken.assemblyline.generators.BlockSolarPanel;
+import com.builtbroken.assemblyline.item.EnumTool;
+import com.builtbroken.assemblyline.item.ItemCommonTool;
 import com.builtbroken.assemblyline.item.ItemOreDirv;
 import com.builtbroken.assemblyline.item.ItemParts;
+import com.builtbroken.assemblyline.item.ItemReadoutTools;
+import com.builtbroken.assemblyline.item.ItemWrench;
 import com.builtbroken.assemblyline.item.ItemParts.Parts;
 import com.builtbroken.assemblyline.machine.BlockCrate;
 import com.builtbroken.assemblyline.machine.processor.BlockProcessor;
+import com.builtbroken.assemblyline.transmit.BlockWire;
 import com.builtbroken.minecraft.EnumMaterial;
 import com.builtbroken.minecraft.EnumOrePart;
 import com.builtbroken.minecraft.helpers.ColorCode;
@@ -25,13 +32,6 @@ import com.builtbroken.minecraft.recipes.MachineRecipeHandler;
 import com.builtbroken.minecraft.recipes.ProcessorType;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-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
 {

src/com/builtbroken/assemblyline/AssemblyLine.java

@@ -39,26 +39,43 @@ 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.BlockBasalt;
+import com.builtbroken.assemblyline.blocks.BlockColorGlass;
+import com.builtbroken.assemblyline.blocks.BlockColorGlowGlass;
+import com.builtbroken.assemblyline.blocks.BlockColorSand;
 import com.builtbroken.assemblyline.blocks.BlockGasOre;
 import com.builtbroken.assemblyline.blocks.BlockOre;
 import com.builtbroken.assemblyline.blocks.GasOreGenerator;
+import com.builtbroken.assemblyline.blocks.ItemBlockColored;
 import com.builtbroken.assemblyline.blocks.BlockOre.OreData;
 import com.builtbroken.assemblyline.entities.EntityFarmEgg;
 import com.builtbroken.assemblyline.entities.EnumBird;
+import com.builtbroken.assemblyline.entities.prefab.EntityTestCar;
+import com.builtbroken.assemblyline.entities.prefab.ItemVehicleSpawn;
 import com.builtbroken.assemblyline.fluid.pipes.BlockPipe;
 import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe;
 import com.builtbroken.assemblyline.fluid.pump.BlockConstructionPump;
 import com.builtbroken.assemblyline.fluid.pump.BlockDrain;
 import com.builtbroken.assemblyline.fluid.pump.BlockPumpMachine;
+import com.builtbroken.assemblyline.generators.BlockSmallSteamGen;
+import com.builtbroken.assemblyline.generators.BlockSolarPanel;
 import com.builtbroken.assemblyline.imprinter.BlockImprinter;
 import com.builtbroken.assemblyline.imprinter.ItemImprinter;
 import com.builtbroken.assemblyline.item.BehaviorDispenseEgg;
+import com.builtbroken.assemblyline.item.ItemBattery;
+import com.builtbroken.assemblyline.item.ItemBlockOre;
+import com.builtbroken.assemblyline.item.ItemColoredDust;
+import com.builtbroken.assemblyline.item.ItemCommonTool;
 import com.builtbroken.assemblyline.item.ItemFarmEgg;
 import com.builtbroken.assemblyline.item.ItemOreDirv;
 import com.builtbroken.assemblyline.item.ItemParts;
+import com.builtbroken.assemblyline.item.ItemReadoutTools;
+import com.builtbroken.assemblyline.item.ItemWrench;
 import com.builtbroken.assemblyline.item.ItemParts.Parts;
 import com.builtbroken.assemblyline.machine.BlockCrate;
+import com.builtbroken.assemblyline.machine.BlockDebug;
 import com.builtbroken.assemblyline.machine.BlockDetector;
+import com.builtbroken.assemblyline.machine.BlockEnergyStorage;
 import com.builtbroken.assemblyline.machine.BlockManipulator;
 import com.builtbroken.assemblyline.machine.BlockRejector;
 import com.builtbroken.assemblyline.machine.BlockReleaseValve;
@@ -66,6 +83,7 @@ import com.builtbroken.assemblyline.machine.BlockSink;
 import com.builtbroken.assemblyline.machine.BlockTank;
 import com.builtbroken.assemblyline.machine.BlockTurntable;
 import com.builtbroken.assemblyline.machine.ItemBlockCrate;
+import com.builtbroken.assemblyline.machine.ItemBlockEnergyStorage;
 import com.builtbroken.assemblyline.machine.ItemFluidCan;
 import com.builtbroken.assemblyline.machine.TileEntityAssembly;
 import com.builtbroken.assemblyline.machine.belt.BlockConveyorBelt;
@@ -73,6 +91,8 @@ 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.builtbroken.assemblyline.transmit.BlockWire;
+import com.builtbroken.assemblyline.transmit.ItemBlockWire;
 import com.builtbroken.minecraft.CoreRegistry;
 import com.builtbroken.minecraft.DarkCore;
 import com.builtbroken.minecraft.EnumMaterial;
@@ -96,26 +116,6 @@ 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)

src/com/builtbroken/assemblyline/CommonProxy.java

@@ -10,8 +10,12 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import com.builtbroken.assemblyline.generators.ContainerCoalGenerator;
+import com.builtbroken.assemblyline.generators.TileEntitySteamGen;
 import com.builtbroken.assemblyline.imprinter.ContainerImprinter;
 import com.builtbroken.assemblyline.imprinter.TileEntityImprinter;
+import com.builtbroken.assemblyline.machine.ContainerBatteryBox;
+import com.builtbroken.assemblyline.machine.TileEntityBatteryBox;
 import com.builtbroken.assemblyline.machine.encoder.ContainerEncoder;
 import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
 import com.builtbroken.assemblyline.machine.processor.ContainerProcessor;
@@ -20,10 +24,6 @@ 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
 {

src/com/builtbroken/assemblyline/blocks/BlockBasalt.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 import java.util.Random;
 

src/com/builtbroken/assemblyline/blocks/BlockColorGlass.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 import java.util.Random;
 

src/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 public class BlockColorGlowGlass extends BlockColorGlass
 {

src/com/builtbroken/assemblyline/blocks/BlockColorSand.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 import java.util.Random;
 

src/com/builtbroken/assemblyline/blocks/BlockColored.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/blocks/ItemBlockColored.java

@@ -1,4 +1,4 @@
-package dark.machines.deco;
+package com.builtbroken.assemblyline.blocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;

src/com/builtbroken/assemblyline/client/ClientProxy.java

@@ -11,6 +11,7 @@ import net.minecraftforge.common.MinecraftForge;
 
 import com.builtbroken.assemblyline.ALRecipeLoader;
 import com.builtbroken.assemblyline.CommonProxy;
+import com.builtbroken.assemblyline.client.gui.GuiBatteryBox;
 import com.builtbroken.assemblyline.client.gui.GuiEncoderCoder;
 import com.builtbroken.assemblyline.client.gui.GuiEncoderHelp;
 import com.builtbroken.assemblyline.client.gui.GuiEncoderInventory;
@@ -27,13 +28,16 @@ import com.builtbroken.assemblyline.client.render.RenderPump;
 import com.builtbroken.assemblyline.client.render.RenderReleaseValve;
 import com.builtbroken.assemblyline.client.render.RenderSink;
 import com.builtbroken.assemblyline.client.render.RenderTank;
+import com.builtbroken.assemblyline.client.render.RenderTestCar;
 import com.builtbroken.assemblyline.client.render.RenderTurkey;
 import com.builtbroken.assemblyline.entities.EntityFarmEgg;
 import com.builtbroken.assemblyline.entities.EntityTurkey;
+import com.builtbroken.assemblyline.entities.prefab.EntityTestCar;
 import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
 import com.builtbroken.assemblyline.fluid.pump.TileEntityConstructionPump;
 import com.builtbroken.assemblyline.fluid.pump.TileEntityStarterPump;
 import com.builtbroken.assemblyline.imprinter.TileEntityImprinter;
+import com.builtbroken.assemblyline.machine.TileEntityBatteryBox;
 import com.builtbroken.assemblyline.machine.TileEntityReleaseValve;
 import com.builtbroken.assemblyline.machine.TileEntitySink;
 import com.builtbroken.assemblyline.machine.TileEntityTank;
@@ -44,10 +48,6 @@ 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

src/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java

@@ -1,4 +1,4 @@
-package dark.machines.client.gui;
+package com.builtbroken.assemblyline.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -11,12 +11,12 @@ import universalelectricity.core.electricity.ElectricityDisplay;
 import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.machine.ContainerBatteryBox;
+import com.builtbroken.assemblyline.machine.TileEntityBatteryBox;
 import com.builtbroken.minecraft.DarkCore;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.machines.machines.ContainerBatteryBox;
-import dark.machines.machines.TileEntityBatteryBox;
 
 @SideOnly(Side.CLIENT)
 public class GuiBatteryBox extends GuiContainer

src/com/builtbroken/assemblyline/client/model/ModelCopperWire.java

@@ -1,4 +1,4 @@
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/com/builtbroken/assemblyline/client/model/ModelMachine.java

@@ -1,4 +1,4 @@
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelBase;
 

src/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/com/builtbroken/assemblyline/client/model/ModelSteamGen.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/com/builtbroken/assemblyline/client/model/ModelTestCar.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.machines.client.models;
+package com.builtbroken.assemblyline.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java

@@ -12,8 +12,10 @@ import com.builtbroken.assemblyline.AssemblyLine;
 import com.builtbroken.assemblyline.client.model.ModelConveyorBelt;
 import com.builtbroken.assemblyline.client.model.ModelCrusher;
 import com.builtbroken.assemblyline.client.model.ModelGrinder;
+import com.builtbroken.assemblyline.client.model.ModelMachine;
 import com.builtbroken.assemblyline.client.model.ModelManipulator;
 import com.builtbroken.assemblyline.client.model.ModelRejectorPiston;
+import com.builtbroken.assemblyline.client.model.ModelSolarPanel;
 import com.builtbroken.assemblyline.machine.red.BlockAdvancedHopper;
 import com.builtbroken.minecraft.DarkCore;
 
@@ -33,6 +35,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
     private ModelManipulator modelInjector = new ModelManipulator();
     private ModelCrusher modelCrushor = new ModelCrusher();
     private ModelGrinder grinderModel = new ModelGrinder();
+    private static ModelSolarPanel solarPanelModel = new ModelSolarPanel();
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
@@ -100,6 +103,21 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
             this.grinderModel.renderRotation(0.0625f, 0);
             GL11.glPopMatrix();
         }
+        else if (ALRecipeLoader.blockSolar != null && block.blockID == ALRecipeLoader.blockSolar.blockID)
+        {
+            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 (ALRecipeLoader.blockSteamGen != null && block.blockID == ALRecipeLoader.blockSteamGen.blockID)
+        {
+            ModelMachine model = RenderSteamGen.getModel(metadata);
+            FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderSteamGen.getTexture(metadata));
+            GL11.glTranslatef(0.0F, 1.1F, 0.0F);
+            GL11.glRotatef(180f, 0f, 0f, 1f);
+            model.render(0.0625F);
+        }
     }
 
     @Override

src/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java

@@ -1,4 +1,4 @@
-package dark.machines.client.renders;
+package com.builtbroken.assemblyline.client.render;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -7,11 +7,11 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.model.ModelSolarPanel;
 import com.builtbroken.minecraft.DarkCore;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.machines.client.models.ModelSolarPanel;
 
 @SideOnly(Side.CLIENT)
 public class RenderBlockSolarPanel extends TileEntitySpecialRenderer

src/com/builtbroken/assemblyline/client/render/RenderBlockWire.java

@@ -1,4 +1,4 @@
-package dark.machines.client.renders;
+package com.builtbroken.assemblyline.client.render;
 
 import ic2.api.energy.tile.IEnergyAcceptor;
 import ic2.api.energy.tile.IEnergyTile;
@@ -16,10 +16,10 @@ import universalelectricity.core.vector.VectorHelper;
 import buildcraft.api.power.IPowerReceptor;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.model.ModelCopperWire;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.machines.client.models.ModelCopperWire;
 
 @SideOnly(Side.CLIENT)
 public class RenderBlockWire extends TileEntitySpecialRenderer

src/com/builtbroken/assemblyline/client/render/RenderSteamGen.java

@@ -1,4 +1,4 @@
-package dark.machines.client.renders;
+package com.builtbroken.assemblyline.client.render;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -8,14 +8,14 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.model.ModelMachine;
+import com.builtbroken.assemblyline.client.model.ModelSteamGen;
+import com.builtbroken.assemblyline.client.model.ModelSteamTurbine;
 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.client.models.ModelMachine;
-import dark.machines.client.models.ModelSteamGen;
-import dark.machines.client.models.ModelSteamTurbine;
 
 @SideOnly(Side.CLIENT)
 public class RenderSteamGen extends TileEntitySpecialRenderer

src/com/builtbroken/assemblyline/client/render/RenderTestCar.java

@@ -1,4 +1,4 @@
-package dark.machines.client.renders;
+package com.builtbroken.assemblyline.client.render;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.Render;
@@ -9,12 +9,12 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.model.ModelTestCar;
+import com.builtbroken.assemblyline.entities.prefab.EntityAdvanced;
 import com.builtbroken.minecraft.DarkCore;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.machines.client.models.ModelTestCar;
-import dark.machines.prefab.entities.EntityAdvanced;
 
 @SideOnly(Side.CLIENT)
 public class RenderTestCar extends Render

src/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java

@@ -1,4 +1,4 @@
-package dark.machines.prefab.entities;
+package com.builtbroken.assemblyline.entities.prefab;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;

src/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java

@@ -1,4 +1,4 @@
-package dark.machines.prefab.entities;
+package com.builtbroken.assemblyline.entities.prefab;
 
 import net.minecraft.world.World;
 

src/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java

@@ -1,4 +1,4 @@
-package dark.machines.prefab.entities;
+package com.builtbroken.assemblyline.entities.prefab;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java

@@ -1,4 +1,4 @@
-package dark.machines.prefab.entities;
+package com.builtbroken.assemblyline.entities.prefab;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java

@@ -1,4 +1,4 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 import java.util.List;
 import java.util.Random;
@@ -16,14 +16,14 @@ import net.minecraftforge.common.Configuration;
 import universalelectricity.core.UniversalElectricity;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
+import com.builtbroken.assemblyline.client.render.RenderSteamGen;
 import com.builtbroken.common.Pair;
 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.client.renders.BlockRenderingHandler;
-import dark.machines.client.renders.RenderSteamGen;
 
 /** Starter power setup using steam generated by burning items or fuels. This setup takes two blocks.
  * A) the generator B) the collector The generator creates the steam and burns the fuel. The

src/com/builtbroken/assemblyline/generators/BlockSolarPanel.java

@@ -1,4 +1,4 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 import java.util.List;
 import java.util.Set;
@@ -12,14 +12,14 @@ import net.minecraftforge.oredict.OreDictionary;
 import universalelectricity.core.UniversalElectricity;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
+import com.builtbroken.assemblyline.client.render.RenderBlockSolarPanel;
 import com.builtbroken.common.Pair;
 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.client.renders.BlockRenderingHandler;
-import dark.machines.client.renders.RenderBlockSolarPanel;
 
 public class BlockSolarPanel extends BlockMachine
 {

src/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java

@@ -1,4 +1,4 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java

@@ -1,10 +1,11 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 import java.util.EnumSet;
 
+import com.builtbroken.assemblyline.machine.TileEntityGenerator;
+
 import micdoodle8.mods.galacticraft.api.world.ISolarLevel;
 import net.minecraftforge.common.ForgeDirection;
-import dark.machines.machines.TileEntityGenerator;
 
 public class TileEntitySolarPanel extends TileEntityGenerator
 {

src/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java

@@ -1,4 +1,4 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 public class TileEntitySteamFan extends TileEntitySteamPiston
 {

src/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java

@@ -1,4 +1,4 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

src/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java

@@ -1,4 +1,4 @@
-package dark.machines.generators;
+package com.builtbroken.assemblyline.generators;
 
 import java.util.EnumSet;
 

src/com/builtbroken/assemblyline/item/EnumTool.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/builtbroken/assemblyline/item/ItemBattery.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.ItemStack;

src/com/builtbroken/assemblyline/item/ItemBlockOre.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;

src/com/builtbroken/assemblyline/item/ItemColoredDust.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/item/ItemCommonTool.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import java.awt.Color;
 import java.util.ArrayList;

src/com/builtbroken/assemblyline/item/ItemReadoutTools.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/item/ItemWrench.java

@@ -1,4 +1,4 @@
-package dark.machines.items;
+package com.builtbroken.assemblyline.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;

src/com/builtbroken/assemblyline/machine/BlockDebug.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import java.util.List;
 import java.util.Set;

src/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import java.util.List;
 import java.util.Set;

src/com/builtbroken/assemblyline/machine/BlockTransformer.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.Configuration;

src/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import java.util.List;
 

src/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import java.util.EnumSet;
 

src/com/builtbroken/assemblyline/machine/TileEntityGenerator.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.electricity.ElectricityPack;

src/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;

src/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import net.minecraftforge.common.ForgeDirection;
 

src/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import java.util.EnumSet;
 

src/com/builtbroken/assemblyline/machine/TileEntityVoid.java

@@ -1,4 +1,4 @@
-package dark.machines.machines;
+package com.builtbroken.assemblyline.machine;
 
 import java.util.HashMap;
 

src/com/builtbroken/assemblyline/transmit/BlockWire.java

@@ -1,4 +1,4 @@
-package dark.machines.transmit;
+package com.builtbroken.assemblyline.transmit;
 
 import java.util.List;
 import java.util.Set;
@@ -21,13 +21,13 @@ import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.tile.TileEntityConductor;
 
 import com.builtbroken.assemblyline.AssemblyLine;
+import com.builtbroken.assemblyline.client.render.RenderBlockWire;
 import com.builtbroken.common.Pair;
 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.client.renders.RenderBlockWire;
 
 public class BlockWire extends BlockMachine
 {

src/com/builtbroken/assemblyline/transmit/ItemBlockWire.java

@@ -1,4 +1,4 @@
-package dark.machines.transmit;
+package com.builtbroken.assemblyline.transmit;
 
 import net.minecraft.util.Icon;
 

src/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java

@@ -1,4 +1,4 @@
-package dark.machines.transmit;
+package com.builtbroken.assemblyline.transmit;
 
 public class TileEntityDetectorWire extends TileEntityWire
 {

src/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java

@@ -1,4 +1,4 @@
-package dark.machines.transmit;
+package com.builtbroken.assemblyline.transmit;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

src/com/builtbroken/assemblyline/transmit/TileEntityWire.java

@@ -1,4 +1,4 @@
-package dark.machines.transmit;
+package com.builtbroken.assemblyline.transmit;
 
 import universalelectricity.compatibility.TileEntityUniversalConductor;
 

src/dark/machines/client/renders/BlockRenderingHandler.java

@@ -1,68 +0,0 @@
-package dark.machines.client.renders;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.IBlockAccess;
-
-import org.lwjgl.opengl.GL11;
-
-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.client.models.ModelMachine;
-import dark.machines.client.models.ModelSolarPanel;
-
-@SideOnly(Side.CLIENT)
-public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
-{
-    public static BlockRenderingHandler instance = new BlockRenderingHandler();
-    public static final int BLOCK_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
-    private static ModelSolarPanel solarPanelModel = new ModelSolarPanel();
-
-    @Override
-    public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
-    {
-        GL11.glPushMatrix();
-        if (ALRecipeLoader.blockSolar != null && block.blockID == ALRecipeLoader.blockSolar.blockID)
-        {
-            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 (ALRecipeLoader.blockSteamGen != null && block.blockID == ALRecipeLoader.blockSteamGen.blockID)
-        {
-            ModelMachine model = RenderSteamGen.getModel(metadata);
-            FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderSteamGen.getTexture(metadata));
-            GL11.glTranslatef(0.0F, 1.1F, 0.0F);
-            GL11.glRotatef(180f, 0f, 0f, 1f);
-            model.render(0.0625F);
-        }
-        GL11.glPopMatrix();
-    }
-
-    @Override
-    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
-    {
-        return false;
-    }
-
-    @Override
-    public boolean shouldRender3DInInventory()
-    {
-        return true;
-    }
-
-    @Override
-    public int getRenderId()
-    {
-        return BLOCK_RENDER_ID;
-    }
-}

src/dark/machines/prefab/LaserEntityDamageSource.java

@@ -1,55 +0,0 @@
-package dark.machines.prefab;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EntityDamageSource;
-import net.minecraftforge.event.ForgeSubscribe;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
-
-public class LaserEntityDamageSource extends EntityDamageSource
-{
-    public LaserEntityDamageSource(Entity par2Entity)
-    {
-        super("Laser", par2Entity);
-    }
-
-    @ForgeSubscribe
-    public void LivingDeathEvent(LivingDeathEvent event)
-    {
-        if (event.entity instanceof EntityCreeper)
-        {
-            if (!event.entity.worldObj.isRemote && event.source instanceof LaserEntityDamageSource)
-            {
-                boolean flag = event.entity.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing");
-
-                if (((EntityCreeper) event.entity).getPowered())
-                {
-                    event.entity.worldObj.createExplosion(event.entity, event.entity.posX, event.entity.posY, event.entity.posZ, 3 * 2, flag);
-                }
-                else
-                {
-                    event.entity.worldObj.createExplosion(event.entity, event.entity.posX, event.entity.posY, event.entity.posZ, 3, flag);
-                }
-            }
-        }
-    }
-
-    @ForgeSubscribe
-    public void LivingAttackEvent(LivingAttackEvent event)
-    {
-        if (event.entity instanceof EntityPlayer)
-        {
-            if (((EntityPlayer) event.entity).inventory.armorItemInSlot(3) == new ItemStack(Item.plateDiamond, 1))
-            {
-                if (event.isCancelable())
-                {
-                    event.setCanceled(true);
-                }
-            }
-        }
-    }
-}

src/dark/machines/prefab/ModPrefab.java

@@ -1,99 +0,0 @@
-package dark.machines.prefab;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import net.minecraft.server.MinecraftServer;
-import net.minecraftforge.common.MinecraftForge;
-
-import org.modstats.Modstats;
-
-import com.builtbroken.common.Triple;
-import com.builtbroken.minecraft.DarkCore;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod.EventHandler;
-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.relauncher.Side;
-
-public abstract class ModPrefab
-{
-
-    public String DOMAIN = this.getDomain();
-    public String PREFIX = DOMAIN + ":";
-
-   
-
-    private static Triple<Integer, Integer, Integer> date;
-
-    private static boolean preInit, init, postInit;
-
-    public abstract String getDomain();
-
-    @EventHandler
-    public void preInit(FMLPreInitializationEvent event)
-    {
-        this.loadModMeta();
-        Modstats.instance().getReporter().registerMod(this);
-        MinecraftForge.EVENT_BUS.register(this);
-        MinecraftForge.EVENT_BUS.register(new LaserEntityDamageSource(null));
-        DarkCore.instance().preLoad();
-    }
-
-    @EventHandler
-    public void init(FMLInitializationEvent event)
-    {
-        DarkCore.instance().Load();
-        this.registerObjects();
-    }
-
-    @EventHandler
-    public void postInit(FMLPostInitializationEvent event)
-    {
-        DarkCore.instance().postLoad();
-        this.loadRecipes();
-    }
-
-    public static void printSidedData(String data)
-    {
-        System.out.print(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT ? "[C]" : "[S]");
-        System.out.println(" " + data);
-    }
-
-    @SuppressWarnings("deprecation")
-    public static Triple<Integer, Integer, Integer> getDate()
-    {
-        Calendar cal = Calendar.getInstance();
-        Date d = cal.getTime();
-
-        if (date == null || date.getB() != d.getDay())
-        {
-            date = new Triple<Integer, Integer, Integer>(d.getMonth(), d.getDay(), d.getYear());
-        }
-        return date;
-    }
-
-    public static boolean isOp(String username)
-    {
-        MinecraftServer theServer = FMLCommonHandler.instance().getMinecraftServerInstance();
-
-        if (theServer != null)
-        {
-            return theServer.getConfigurationManager().getOps().contains(username.trim().toLowerCase());
-        }
-
-        return false;
-    }
-
-    /** Loads the settings that tell what this mod is named, about, and other info to the user */
-    public abstract void loadModMeta();
-
-    /** Tells the mod to start registering its items and blocks */
-    public abstract void registerObjects();
-
-    /** Tells the mod to start registering its recipes */
-    public abstract void loadRecipes();
-
-}

src/dark/machines/prefab/TileDamageSource.java

@@ -1,39 +0,0 @@
-package dark.machines.prefab;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.player.EntityPlayer;
-import universalelectricity.prefab.CustomDamageSource;
-
-public class TileDamageSource extends CustomDamageSource
-{
-    protected Object damageSource;
-
-    public TileDamageSource(String damageName, Object attacker)
-    {
-        super(damageName);
-        this.damageSource = attacker;
-    }
-
-    @Override
-    public Entity getEntity()
-    {
-        return damageSource instanceof Entity ? ((Entity) damageSource) : null;
-    }
-
-    @Override
-    public boolean isDifficultyScaled()
-    {
-        return this.damageSource != null && this.damageSource instanceof EntityLiving && !(this.damageSource instanceof EntityPlayer);
-    }
-
-    public static TileDamageSource doBulletDamage(Object object)
-    {
-        return (TileDamageSource) ((CustomDamageSource) new TileDamageSource("Bullets", object).setProjectile()).setDeathMessage("%1$s was filled with holes!");
-    }
-
-    public static TileDamageSource doLaserDamage(Object object)
-    {
-        return (TileDamageSource) ((CustomDamageSource) new TileDamageSource("Laser", object).setProjectile()).setDeathMessage("%1$s was vaporized!");
-    }
-}