diff --git a/src/com/builtbroken/assemblyline/ALRecipeLoader.java b/src/com/builtbroken/assemblyline/ALRecipeLoader.java index 438eb7fee..f1653bc93 100644 --- a/src/com/builtbroken/assemblyline/ALRecipeLoader.java +++ b/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 { diff --git a/src/com/builtbroken/assemblyline/AssemblyLine.java b/src/com/builtbroken/assemblyline/AssemblyLine.java index 7b83e2361..1147f47d3 100644 --- a/src/com/builtbroken/assemblyline/AssemblyLine.java +++ b/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) diff --git a/src/com/builtbroken/assemblyline/CommonProxy.java b/src/com/builtbroken/assemblyline/CommonProxy.java index dd72a2d04..77eb13b45 100644 --- a/src/com/builtbroken/assemblyline/CommonProxy.java +++ b/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 { diff --git a/src/dark/machines/deco/BlockBasalt.java b/src/com/builtbroken/assemblyline/blocks/BlockBasalt.java similarity index 98% rename from src/dark/machines/deco/BlockBasalt.java rename to src/com/builtbroken/assemblyline/blocks/BlockBasalt.java index 5263e811c..1e266b03c 100644 --- a/src/dark/machines/deco/BlockBasalt.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockBasalt.java @@ -1,4 +1,4 @@ -package dark.machines.deco; +package com.builtbroken.assemblyline.blocks; import java.util.Random; diff --git a/src/dark/machines/deco/BlockColorGlass.java b/src/com/builtbroken/assemblyline/blocks/BlockColorGlass.java similarity index 96% rename from src/dark/machines/deco/BlockColorGlass.java rename to src/com/builtbroken/assemblyline/blocks/BlockColorGlass.java index a4071571d..72b83330b 100644 --- a/src/dark/machines/deco/BlockColorGlass.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockColorGlass.java @@ -1,4 +1,4 @@ -package dark.machines.deco; +package com.builtbroken.assemblyline.blocks; import java.util.Random; diff --git a/src/dark/machines/deco/BlockColorGlowGlass.java b/src/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java similarity index 81% rename from src/dark/machines/deco/BlockColorGlowGlass.java rename to src/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java index 59366f5bc..119c9b9e8 100644 --- a/src/dark/machines/deco/BlockColorGlowGlass.java +++ b/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 { diff --git a/src/dark/machines/deco/BlockColorSand.java b/src/com/builtbroken/assemblyline/blocks/BlockColorSand.java similarity index 98% rename from src/dark/machines/deco/BlockColorSand.java rename to src/com/builtbroken/assemblyline/blocks/BlockColorSand.java index 658763c5c..3a6fffab8 100644 --- a/src/dark/machines/deco/BlockColorSand.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockColorSand.java @@ -1,4 +1,4 @@ -package dark.machines.deco; +package com.builtbroken.assemblyline.blocks; import java.util.Random; diff --git a/src/dark/machines/deco/BlockColored.java b/src/com/builtbroken/assemblyline/blocks/BlockColored.java similarity index 98% rename from src/dark/machines/deco/BlockColored.java rename to src/com/builtbroken/assemblyline/blocks/BlockColored.java index a7e075a4e..74b3661d4 100644 --- a/src/dark/machines/deco/BlockColored.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockColored.java @@ -1,4 +1,4 @@ -package dark.machines.deco; +package com.builtbroken.assemblyline.blocks; import java.util.List; diff --git a/src/dark/machines/deco/ItemBlockBasalt.java b/src/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java similarity index 94% rename from src/dark/machines/deco/ItemBlockBasalt.java rename to src/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java index 08956fee6..5d431c7f5 100644 --- a/src/dark/machines/deco/ItemBlockBasalt.java +++ b/src/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java @@ -1,4 +1,4 @@ -package dark.machines.deco; +package com.builtbroken.assemblyline.blocks; import java.util.List; diff --git a/src/dark/machines/deco/ItemBlockColored.java b/src/com/builtbroken/assemblyline/blocks/ItemBlockColored.java similarity index 94% rename from src/dark/machines/deco/ItemBlockColored.java rename to src/com/builtbroken/assemblyline/blocks/ItemBlockColored.java index f3bc6905d..aa1114fe0 100644 --- a/src/dark/machines/deco/ItemBlockColored.java +++ b/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; diff --git a/src/com/builtbroken/assemblyline/client/ClientProxy.java b/src/com/builtbroken/assemblyline/client/ClientProxy.java index 1cce240b1..ad7dbd69d 100644 --- a/src/com/builtbroken/assemblyline/client/ClientProxy.java +++ b/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 diff --git a/src/dark/machines/client/gui/GuiBatteryBox.java b/src/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java similarity index 94% rename from src/dark/machines/client/gui/GuiBatteryBox.java rename to src/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java index 8f2c6ccec..74e3249d2 100644 --- a/src/dark/machines/client/gui/GuiBatteryBox.java +++ b/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 diff --git a/src/dark/machines/client/models/ModelCopperWire.java b/src/com/builtbroken/assemblyline/client/model/ModelCopperWire.java similarity index 98% rename from src/dark/machines/client/models/ModelCopperWire.java rename to src/com/builtbroken/assemblyline/client/model/ModelCopperWire.java index b44b4f8a3..df4982c21 100644 --- a/src/dark/machines/client/models/ModelCopperWire.java +++ b/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; diff --git a/src/dark/machines/client/models/ModelElecFurnace.java b/src/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java similarity index 98% rename from src/dark/machines/client/models/ModelElecFurnace.java rename to src/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java index 3c57ac135..842f66339 100644 --- a/src/dark/machines/client/models/ModelElecFurnace.java +++ b/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; diff --git a/src/dark/machines/client/models/ModelMachine.java b/src/com/builtbroken/assemblyline/client/model/ModelMachine.java similarity index 74% rename from src/dark/machines/client/models/ModelMachine.java rename to src/com/builtbroken/assemblyline/client/model/ModelMachine.java index cb1c88040..8773a2980 100644 --- a/src/dark/machines/client/models/ModelMachine.java +++ b/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; diff --git a/src/dark/machines/client/models/ModelSolarPanel.java b/src/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java similarity index 97% rename from src/dark/machines/client/models/ModelSolarPanel.java rename to src/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java index ba2a2193c..d97b8e646 100644 --- a/src/dark/machines/client/models/ModelSolarPanel.java +++ b/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; diff --git a/src/dark/machines/client/models/ModelSteamGen.java b/src/com/builtbroken/assemblyline/client/model/ModelSteamGen.java similarity index 99% rename from src/dark/machines/client/models/ModelSteamGen.java rename to src/com/builtbroken/assemblyline/client/model/ModelSteamGen.java index e8c28d286..5343e985e 100644 --- a/src/dark/machines/client/models/ModelSteamGen.java +++ b/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; diff --git a/src/dark/machines/client/models/ModelSteamTurbine.java b/src/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java similarity index 99% rename from src/dark/machines/client/models/ModelSteamTurbine.java rename to src/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java index 45fb86b2a..e507154ed 100644 --- a/src/dark/machines/client/models/ModelSteamTurbine.java +++ b/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; diff --git a/src/dark/machines/client/models/ModelTestCar.java b/src/com/builtbroken/assemblyline/client/model/ModelTestCar.java similarity index 99% rename from src/dark/machines/client/models/ModelTestCar.java rename to src/com/builtbroken/assemblyline/client/model/ModelTestCar.java index 853a94eb9..1101eca0f 100644 --- a/src/dark/machines/client/models/ModelTestCar.java +++ b/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; diff --git a/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java b/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java index 13e86b3b1..46363648d 100644 --- a/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java +++ b/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 diff --git a/src/dark/machines/client/renders/RenderBlockSolarPanel.java b/src/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java similarity index 90% rename from src/dark/machines/client/renders/RenderBlockSolarPanel.java rename to src/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java index 9d6206659..55dcb924e 100644 --- a/src/dark/machines/client/renders/RenderBlockSolarPanel.java +++ b/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 diff --git a/src/dark/machines/client/renders/RenderBlockWire.java b/src/com/builtbroken/assemblyline/client/render/RenderBlockWire.java similarity index 95% rename from src/dark/machines/client/renders/RenderBlockWire.java rename to src/com/builtbroken/assemblyline/client/render/RenderBlockWire.java index 1ec257447..dd3b65358 100644 --- a/src/dark/machines/client/renders/RenderBlockWire.java +++ b/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 diff --git a/src/dark/machines/client/renders/RenderSteamGen.java b/src/com/builtbroken/assemblyline/client/render/RenderSteamGen.java similarity index 93% rename from src/dark/machines/client/renders/RenderSteamGen.java rename to src/com/builtbroken/assemblyline/client/render/RenderSteamGen.java index 3ab17a540..188435072 100644 --- a/src/dark/machines/client/renders/RenderSteamGen.java +++ b/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 diff --git a/src/dark/machines/client/renders/RenderTestCar.java b/src/com/builtbroken/assemblyline/client/render/RenderTestCar.java similarity index 91% rename from src/dark/machines/client/renders/RenderTestCar.java rename to src/com/builtbroken/assemblyline/client/render/RenderTestCar.java index 5b9684157..9b8bc7207 100644 --- a/src/dark/machines/client/renders/RenderTestCar.java +++ b/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 diff --git a/src/dark/machines/prefab/entities/EntityAdvanced.java b/src/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java similarity index 98% rename from src/dark/machines/prefab/entities/EntityAdvanced.java rename to src/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java index c25c273f7..3494f7a74 100644 --- a/src/dark/machines/prefab/entities/EntityAdvanced.java +++ b/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; diff --git a/src/dark/machines/prefab/entities/EntityTestCar.java b/src/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java similarity index 91% rename from src/dark/machines/prefab/entities/EntityTestCar.java rename to src/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java index dfe0eb854..3d119a81f 100644 --- a/src/dark/machines/prefab/entities/EntityTestCar.java +++ b/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; diff --git a/src/dark/machines/prefab/entities/EntityVehicle.java b/src/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java similarity index 99% rename from src/dark/machines/prefab/entities/EntityVehicle.java rename to src/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java index 21043bd13..9cbb9e36f 100644 --- a/src/dark/machines/prefab/entities/EntityVehicle.java +++ b/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; diff --git a/src/dark/machines/prefab/entities/ItemVehicleSpawn.java b/src/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java similarity index 98% rename from src/dark/machines/prefab/entities/ItemVehicleSpawn.java rename to src/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java index e82cb3401..d8f3df0a7 100644 --- a/src/dark/machines/prefab/entities/ItemVehicleSpawn.java +++ b/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; diff --git a/src/dark/machines/generators/BlockSmallSteamGen.java b/src/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java similarity index 97% rename from src/dark/machines/generators/BlockSmallSteamGen.java rename to src/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java index 7d15e81f6..fa99b6ff9 100644 --- a/src/dark/machines/generators/BlockSmallSteamGen.java +++ b/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 diff --git a/src/dark/machines/generators/BlockSolarPanel.java b/src/com/builtbroken/assemblyline/generators/BlockSolarPanel.java similarity index 93% rename from src/dark/machines/generators/BlockSolarPanel.java rename to src/com/builtbroken/assemblyline/generators/BlockSolarPanel.java index baba776b8..352e42184 100644 --- a/src/dark/machines/generators/BlockSolarPanel.java +++ b/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 { diff --git a/src/dark/machines/generators/ContainerCoalGenerator.java b/src/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java similarity index 98% rename from src/dark/machines/generators/ContainerCoalGenerator.java rename to src/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java index f3c2db0c3..c6e3ae650 100644 --- a/src/dark/machines/generators/ContainerCoalGenerator.java +++ b/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; diff --git a/src/dark/machines/generators/TileEntitySolarPanel.java b/src/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java similarity index 93% rename from src/dark/machines/generators/TileEntitySolarPanel.java rename to src/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java index b4e7a8824..ed72885aa 100644 --- a/src/dark/machines/generators/TileEntitySolarPanel.java +++ b/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 { diff --git a/src/dark/machines/generators/TileEntitySteamFan.java b/src/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java similarity index 72% rename from src/dark/machines/generators/TileEntitySteamFan.java rename to src/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java index 26041e225..a10b23073 100644 --- a/src/dark/machines/generators/TileEntitySteamFan.java +++ b/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 { diff --git a/src/dark/machines/generators/TileEntitySteamGen.java b/src/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java similarity index 98% rename from src/dark/machines/generators/TileEntitySteamGen.java rename to src/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java index d9018b60b..dde918084 100644 --- a/src/dark/machines/generators/TileEntitySteamGen.java +++ b/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; diff --git a/src/dark/machines/generators/TileEntitySteamPiston.java b/src/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java similarity index 97% rename from src/dark/machines/generators/TileEntitySteamPiston.java rename to src/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java index ce804f8e5..2b5464fc5 100644 --- a/src/dark/machines/generators/TileEntitySteamPiston.java +++ b/src/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java @@ -1,4 +1,4 @@ -package dark.machines.generators; +package com.builtbroken.assemblyline.generators; import java.util.EnumSet; diff --git a/src/dark/machines/items/EnumTool.java b/src/com/builtbroken/assemblyline/item/EnumTool.java similarity index 98% rename from src/dark/machines/items/EnumTool.java rename to src/com/builtbroken/assemblyline/item/EnumTool.java index ca0136302..e776fdabf 100644 --- a/src/dark/machines/items/EnumTool.java +++ b/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; diff --git a/src/dark/machines/items/ItemBattery.java b/src/com/builtbroken/assemblyline/item/ItemBattery.java similarity index 97% rename from src/dark/machines/items/ItemBattery.java rename to src/com/builtbroken/assemblyline/item/ItemBattery.java index 2543d9071..2237b0538 100644 --- a/src/dark/machines/items/ItemBattery.java +++ b/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; diff --git a/src/dark/machines/items/ItemBlockOre.java b/src/com/builtbroken/assemblyline/item/ItemBlockOre.java similarity index 95% rename from src/dark/machines/items/ItemBlockOre.java rename to src/com/builtbroken/assemblyline/item/ItemBlockOre.java index 93a1ab25d..f51af632c 100644 --- a/src/dark/machines/items/ItemBlockOre.java +++ b/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; diff --git a/src/dark/machines/items/ItemColoredDust.java b/src/com/builtbroken/assemblyline/item/ItemColoredDust.java similarity index 97% rename from src/dark/machines/items/ItemColoredDust.java rename to src/com/builtbroken/assemblyline/item/ItemColoredDust.java index edd2be222..940bcc97c 100644 --- a/src/dark/machines/items/ItemColoredDust.java +++ b/src/com/builtbroken/assemblyline/item/ItemColoredDust.java @@ -1,4 +1,4 @@ -package dark.machines.items; +package com.builtbroken.assemblyline.item; import java.util.List; diff --git a/src/dark/machines/items/ItemCommonTool.java b/src/com/builtbroken/assemblyline/item/ItemCommonTool.java similarity index 99% rename from src/dark/machines/items/ItemCommonTool.java rename to src/com/builtbroken/assemblyline/item/ItemCommonTool.java index 2e4919922..4ec3e72e1 100644 --- a/src/dark/machines/items/ItemCommonTool.java +++ b/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; diff --git a/src/dark/machines/items/ItemReadoutTools.java b/src/com/builtbroken/assemblyline/item/ItemReadoutTools.java similarity index 99% rename from src/dark/machines/items/ItemReadoutTools.java rename to src/com/builtbroken/assemblyline/item/ItemReadoutTools.java index 82c1430d7..8454d5363 100644 --- a/src/dark/machines/items/ItemReadoutTools.java +++ b/src/com/builtbroken/assemblyline/item/ItemReadoutTools.java @@ -1,4 +1,4 @@ -package dark.machines.items; +package com.builtbroken.assemblyline.item; import java.util.List; diff --git a/src/dark/machines/items/ItemWrench.java b/src/com/builtbroken/assemblyline/item/ItemWrench.java similarity index 98% rename from src/dark/machines/items/ItemWrench.java rename to src/com/builtbroken/assemblyline/item/ItemWrench.java index 14321c95a..943a25699 100644 --- a/src/dark/machines/items/ItemWrench.java +++ b/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; diff --git a/src/dark/machines/machines/BlockDebug.java b/src/com/builtbroken/assemblyline/machine/BlockDebug.java similarity index 99% rename from src/dark/machines/machines/BlockDebug.java rename to src/com/builtbroken/assemblyline/machine/BlockDebug.java index f838325aa..76bc78b7e 100644 --- a/src/dark/machines/machines/BlockDebug.java +++ b/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; diff --git a/src/dark/machines/machines/BlockEnergyStorage.java b/src/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java similarity index 98% rename from src/dark/machines/machines/BlockEnergyStorage.java rename to src/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java index 58f5fae82..8603e6d0c 100644 --- a/src/dark/machines/machines/BlockEnergyStorage.java +++ b/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; diff --git a/src/dark/machines/machines/BlockTransformer.java b/src/com/builtbroken/assemblyline/machine/BlockTransformer.java similarity index 92% rename from src/dark/machines/machines/BlockTransformer.java rename to src/com/builtbroken/assemblyline/machine/BlockTransformer.java index ceb31d5ae..b1f5c3e76 100644 --- a/src/dark/machines/machines/BlockTransformer.java +++ b/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; diff --git a/src/dark/machines/machines/ContainerBatteryBox.java b/src/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java similarity index 98% rename from src/dark/machines/machines/ContainerBatteryBox.java rename to src/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java index 32541906d..7b0ee0c62 100644 --- a/src/dark/machines/machines/ContainerBatteryBox.java +++ b/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; diff --git a/src/dark/machines/machines/ItemBlockEnergyStorage.java b/src/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java similarity index 98% rename from src/dark/machines/machines/ItemBlockEnergyStorage.java rename to src/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java index 4a583bb96..7d5fa9a52 100644 --- a/src/dark/machines/machines/ItemBlockEnergyStorage.java +++ b/src/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java @@ -1,4 +1,4 @@ -package dark.machines.machines; +package com.builtbroken.assemblyline.machine; import java.util.List; diff --git a/src/dark/machines/machines/TileEntityBatteryBox.java b/src/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java similarity index 99% rename from src/dark/machines/machines/TileEntityBatteryBox.java rename to src/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java index 806e035b8..de2734bc5 100644 --- a/src/dark/machines/machines/TileEntityBatteryBox.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java @@ -1,4 +1,4 @@ -package dark.machines.machines; +package com.builtbroken.assemblyline.machine; import java.util.EnumSet; diff --git a/src/dark/machines/machines/TileEntityGenerator.java b/src/com/builtbroken/assemblyline/machine/TileEntityGenerator.java similarity index 97% rename from src/dark/machines/machines/TileEntityGenerator.java rename to src/com/builtbroken/assemblyline/machine/TileEntityGenerator.java index 71e9df89e..17086bdf1 100644 --- a/src/dark/machines/machines/TileEntityGenerator.java +++ b/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; diff --git a/src/dark/machines/machines/TileEntityInfFluid.java b/src/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java similarity index 98% rename from src/dark/machines/machines/TileEntityInfFluid.java rename to src/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java index b5e948fda..93e45ab70 100644 --- a/src/dark/machines/machines/TileEntityInfFluid.java +++ b/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; diff --git a/src/dark/machines/machines/TileEntityInfLoad.java b/src/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java similarity index 95% rename from src/dark/machines/machines/TileEntityInfLoad.java rename to src/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java index 396838734..6ebce4bc4 100644 --- a/src/dark/machines/machines/TileEntityInfLoad.java +++ b/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; diff --git a/src/dark/machines/machines/TileEntityInfSupply.java b/src/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java similarity index 96% rename from src/dark/machines/machines/TileEntityInfSupply.java rename to src/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java index 8e10bbbfe..5acf56554 100644 --- a/src/dark/machines/machines/TileEntityInfSupply.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java @@ -1,4 +1,4 @@ -package dark.machines.machines; +package com.builtbroken.assemblyline.machine; import java.util.EnumSet; diff --git a/src/dark/machines/machines/TileEntityVoid.java b/src/com/builtbroken/assemblyline/machine/TileEntityVoid.java similarity index 97% rename from src/dark/machines/machines/TileEntityVoid.java rename to src/com/builtbroken/assemblyline/machine/TileEntityVoid.java index 1b0d48223..313f39ece 100644 --- a/src/dark/machines/machines/TileEntityVoid.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityVoid.java @@ -1,4 +1,4 @@ -package dark.machines.machines; +package com.builtbroken.assemblyline.machine; import java.util.HashMap; diff --git a/src/dark/machines/transmit/BlockWire.java b/src/com/builtbroken/assemblyline/transmit/BlockWire.java similarity index 98% rename from src/dark/machines/transmit/BlockWire.java rename to src/com/builtbroken/assemblyline/transmit/BlockWire.java index 069fc1c6c..e01fc1e86 100644 --- a/src/dark/machines/transmit/BlockWire.java +++ b/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 { diff --git a/src/dark/machines/transmit/ItemBlockWire.java b/src/com/builtbroken/assemblyline/transmit/ItemBlockWire.java similarity index 91% rename from src/dark/machines/transmit/ItemBlockWire.java rename to src/com/builtbroken/assemblyline/transmit/ItemBlockWire.java index 5ce4eb3c7..c6c39ea72 100644 --- a/src/dark/machines/transmit/ItemBlockWire.java +++ b/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; diff --git a/src/dark/machines/transmit/TileEntityDetectorWire.java b/src/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java similarity index 89% rename from src/dark/machines/transmit/TileEntityDetectorWire.java rename to src/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java index 89967d45e..23acdaf0c 100644 --- a/src/dark/machines/transmit/TileEntityDetectorWire.java +++ b/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 { diff --git a/src/dark/machines/transmit/TileEntitySwitchWire.java b/src/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java similarity index 94% rename from src/dark/machines/transmit/TileEntitySwitchWire.java rename to src/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java index a15c80c8f..251561bdb 100644 --- a/src/dark/machines/transmit/TileEntitySwitchWire.java +++ b/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; diff --git a/src/dark/machines/transmit/TileEntityWire.java b/src/com/builtbroken/assemblyline/transmit/TileEntityWire.java similarity index 94% rename from src/dark/machines/transmit/TileEntityWire.java rename to src/com/builtbroken/assemblyline/transmit/TileEntityWire.java index 30c8a6037..9d0c03b2d 100644 --- a/src/dark/machines/transmit/TileEntityWire.java +++ b/src/com/builtbroken/assemblyline/transmit/TileEntityWire.java @@ -1,4 +1,4 @@ -package dark.machines.transmit; +package com.builtbroken.assemblyline.transmit; import universalelectricity.compatibility.TileEntityUniversalConductor; diff --git a/src/dark/machines/client/renders/BlockRenderingHandler.java b/src/dark/machines/client/renders/BlockRenderingHandler.java deleted file mode 100644 index b81cac7b4..000000000 --- a/src/dark/machines/client/renders/BlockRenderingHandler.java +++ /dev/null @@ -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; - } -} diff --git a/src/dark/machines/prefab/LaserEntityDamageSource.java b/src/dark/machines/prefab/LaserEntityDamageSource.java deleted file mode 100644 index 53ab64c0a..000000000 --- a/src/dark/machines/prefab/LaserEntityDamageSource.java +++ /dev/null @@ -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); - } - } - } - } -} diff --git a/src/dark/machines/prefab/ModPrefab.java b/src/dark/machines/prefab/ModPrefab.java deleted file mode 100644 index 063b26a9f..000000000 --- a/src/dark/machines/prefab/ModPrefab.java +++ /dev/null @@ -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 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 getDate() - { - Calendar cal = Calendar.getInstance(); - Date d = cal.getTime(); - - if (date == null || date.getB() != d.getDay()) - { - date = new Triple(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(); - -} diff --git a/src/dark/machines/prefab/TileDamageSource.java b/src/dark/machines/prefab/TileDamageSource.java deleted file mode 100644 index b2f4f5e7f..000000000 --- a/src/dark/machines/prefab/TileDamageSource.java +++ /dev/null @@ -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!"); - } -}