diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index fd8876d1..d0d619aa 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -23,7 +23,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.launchwrapper.Launch; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -35,11 +34,9 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; - import buildcraft.api.blueprints.BlueprintDeployer; import buildcraft.api.blueprints.SchematicBlock; import buildcraft.api.blueprints.SchematicEntity; @@ -73,17 +70,6 @@ import buildcraft.builders.TileFiller; import buildcraft.builders.TileMarker; import buildcraft.builders.TilePathMarker; import buildcraft.builders.blueprints.BlueprintDatabase; -import buildcraft.builders.filler.FillerRegistry; -import buildcraft.builders.filler.pattern.FillerPattern; -import buildcraft.builders.filler.pattern.PatternBox; -import buildcraft.builders.filler.pattern.PatternClear; -import buildcraft.builders.filler.pattern.PatternCylinder; -import buildcraft.builders.filler.pattern.PatternFill; -import buildcraft.builders.filler.pattern.PatternFlatten; -import buildcraft.builders.filler.pattern.PatternFrame; -import buildcraft.builders.filler.pattern.PatternHorizon; -import buildcraft.builders.filler.pattern.PatternPyramid; -import buildcraft.builders.filler.pattern.PatternStairs; import buildcraft.builders.schematics.SchematicBed; import buildcraft.builders.schematics.SchematicBlockCreative; import buildcraft.builders.schematics.SchematicCactus; @@ -128,6 +114,17 @@ import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.Version; import buildcraft.core.blueprints.RealBlueprintDeployer; +import buildcraft.core.blueprints.patterns.FillerPattern; +import buildcraft.core.blueprints.patterns.FillerRegistry; +import buildcraft.core.blueprints.patterns.PatternBox; +import buildcraft.core.blueprints.patterns.PatternClear; +import buildcraft.core.blueprints.patterns.PatternCylinder; +import buildcraft.core.blueprints.patterns.PatternFill; +import buildcraft.core.blueprints.patterns.PatternFlatten; +import buildcraft.core.blueprints.patterns.PatternFrame; +import buildcraft.core.blueprints.patterns.PatternHorizon; +import buildcraft.core.blueprints.patterns.PatternPyramid; +import buildcraft.core.blueprints.patterns.PatternStairs; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.science.TechnoSimpleItem; import buildcraft.core.science.Tier; diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 48317b53..43477ee6 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -10,8 +10,8 @@ package buildcraft.builders; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; - import buildcraft.core.render.RenderBlockMultiTexture; +import buildcraft.core.render.RenderBuilder; public class BuilderProxyClient extends BuilderProxy { diff --git a/common/buildcraft/builders/RenderArchitect.java b/common/buildcraft/builders/RenderArchitect.java index f489f795..8ae5a57c 100755 --- a/common/buildcraft/builders/RenderArchitect.java +++ b/common/buildcraft/builders/RenderArchitect.java @@ -12,10 +12,9 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; - -import buildcraft.builders.urbanism.RenderBoxProvider; import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; +import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderLaser; public class RenderArchitect extends RenderBoxProvider { diff --git a/common/buildcraft/builders/RenderBuildingItems.java b/common/buildcraft/builders/RenderBuildingItems.java index 066ef871..a1ff1d1b 100755 --- a/common/buildcraft/builders/RenderBuildingItems.java +++ b/common/buildcraft/builders/RenderBuildingItems.java @@ -10,6 +10,9 @@ package buildcraft.builders; import org.lwjgl.opengl.GL11; +import buildcraft.core.StackAtPosition; +import buildcraft.core.blueprints.BuildingItem; +import buildcraft.core.blueprints.IBuildingItemsProvider; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; diff --git a/common/buildcraft/builders/RenderConstructionMarker.java b/common/buildcraft/builders/RenderConstructionMarker.java index 08261fea..9f09bddc 100755 --- a/common/buildcraft/builders/RenderConstructionMarker.java +++ b/common/buildcraft/builders/RenderConstructionMarker.java @@ -18,9 +18,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import buildcraft.builders.urbanism.RenderBoxProvider; import buildcraft.core.EntityLaser; +import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderLaser; public class RenderConstructionMarker extends RenderBoxProvider { diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index de1eac47..3f4da8d6 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -20,7 +20,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.WorldSettings.GameType; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -28,7 +27,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftBuilders; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IInvSlot; @@ -48,6 +46,7 @@ import buildcraft.core.blueprints.BptBuilderBase; import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.RecursiveBlueprintBuilder; +import buildcraft.core.blueprints.TileAbstractBuilder; import buildcraft.core.fluids.Tank; import buildcraft.core.fluids.TankManager; import buildcraft.core.inventory.ITransactor; diff --git a/common/buildcraft/builders/TileConstructionMarker.java b/common/buildcraft/builders/TileConstructionMarker.java index a8cc093c..95eca55c 100755 --- a/common/buildcraft/builders/TileConstructionMarker.java +++ b/common/buildcraft/builders/TileConstructionMarker.java @@ -14,9 +14,7 @@ import java.util.HashSet; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.NetworkData; import buildcraft.api.core.Position; import buildcraft.core.Box; @@ -29,6 +27,8 @@ import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptBuilderBase; import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.blueprints.BptContext; +import buildcraft.core.blueprints.BuildingItem; +import buildcraft.core.blueprints.IBuildingItemsProvider; import buildcraft.core.network.RPC; import buildcraft.core.network.RPCHandler; import buildcraft.core.network.RPCMessageInfo; diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index caa18a73..51e2aa3f 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -11,25 +11,24 @@ package buildcraft.builders; import java.io.IOException; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionReceptor; -import buildcraft.builders.filler.pattern.FillerPattern; -import buildcraft.builders.filler.pattern.PatternFill; import buildcraft.builders.triggers.ActionFiller; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IMachine; import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.BptContext; +import buildcraft.core.blueprints.TileAbstractBuilder; +import buildcraft.core.blueprints.patterns.FillerPattern; +import buildcraft.core.blueprints.patterns.PatternFill; import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index dd36704a..f3e551bf 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -11,11 +11,10 @@ package buildcraft.builders.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.api.filler.FillerManager; import buildcraft.builders.TileFiller; -import buildcraft.builders.filler.pattern.FillerPattern; import buildcraft.core.DefaultProps; +import buildcraft.core.blueprints.patterns.FillerPattern; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.gui.GuiTools; import buildcraft.core.gui.buttons.GuiBetterButton; diff --git a/common/buildcraft/builders/triggers/ActionFiller.java b/common/buildcraft/builders/triggers/ActionFiller.java index 1c28bf5c..ec26ad58 100644 --- a/common/buildcraft/builders/triggers/ActionFiller.java +++ b/common/buildcraft/builders/triggers/ActionFiller.java @@ -9,8 +9,7 @@ package buildcraft.builders.triggers; import net.minecraft.util.IIcon; - -import buildcraft.builders.filler.pattern.FillerPattern; +import buildcraft.core.blueprints.patterns.FillerPattern; import buildcraft.core.triggers.BCActionPassive; public class ActionFiller extends BCActionPassive { diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index 1aea5019..ac02c00a 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -15,14 +15,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.filler.IFillerPattern; -import buildcraft.builders.filler.pattern.FillerPattern; import buildcraft.core.Box; import buildcraft.core.DefaultProps; +import buildcraft.core.blueprints.patterns.FillerPattern; import buildcraft.core.gui.AdvancedSlot; import buildcraft.core.gui.GuiAdvancedInterface; diff --git a/common/buildcraft/builders/StackAtPosition.java b/common/buildcraft/core/StackAtPosition.java similarity index 94% rename from common/buildcraft/builders/StackAtPosition.java rename to common/buildcraft/core/StackAtPosition.java index 3f436d9e..e8b7d9d1 100755 --- a/common/buildcraft/builders/StackAtPosition.java +++ b/common/buildcraft/core/StackAtPosition.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders; +package buildcraft.core; import net.minecraft.item.ItemStack; import buildcraft.api.core.NetworkData; diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index 1604dbd2..98fb9124 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -20,9 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - import net.minecraftforge.common.util.Constants; - import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; @@ -31,9 +29,6 @@ import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.Position; -import buildcraft.builders.BuildingItem; -import buildcraft.builders.IBuildingItemsProvider; -import buildcraft.builders.TileAbstractBuilder; import buildcraft.core.Box; public abstract class BptBuilderBase implements IAreaProvider { diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 4bc613bf..fdce9be4 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -26,13 +26,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; import buildcraft.api.blueprints.SchematicEntity; @@ -42,8 +40,6 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IInvSlot; import buildcraft.api.core.StackKey; -import buildcraft.builders.IBuildingItemsProvider; -import buildcraft.builders.TileAbstractBuilder; import buildcraft.builders.TileBuilder; import buildcraft.core.blueprints.BuildingSlotBlock.Mode; import buildcraft.core.inventory.InventoryCopy; diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index bda09064..5a108a90 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -12,15 +12,12 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.blueprints.SchematicRegistry; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IInvSlot; -import buildcraft.builders.TileAbstractBuilder; import buildcraft.core.blueprints.BuildingSlotBlock.Mode; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.utils.BlockUtil; diff --git a/common/buildcraft/builders/BuildingItem.java b/common/buildcraft/core/blueprints/BuildingItem.java similarity index 96% rename from common/buildcraft/builders/BuildingItem.java rename to common/buildcraft/core/blueprints/BuildingItem.java index 51f045a1..a7add269 100755 --- a/common/buildcraft/builders/BuildingItem.java +++ b/common/buildcraft/core/blueprints/BuildingItem.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders; +package buildcraft.core.blueprints; import java.util.Date; import java.util.LinkedList; @@ -15,21 +15,16 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import net.minecraftforge.common.util.Constants; - import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.core.NetworkData; import buildcraft.api.core.Position; -import buildcraft.core.blueprints.BuildingSlot; -import buildcraft.core.blueprints.BuildingSlotBlock; -import buildcraft.core.blueprints.BuildingSlotEntity; -import buildcraft.core.blueprints.IBuilingItem; +import buildcraft.core.StackAtPosition; -public class BuildingItem implements IBuilingItem { +public class BuildingItem implements IBuildingItem { public static int ITEMS_SPACE = 2; diff --git a/common/buildcraft/core/blueprints/IBuilingItem.java b/common/buildcraft/core/blueprints/IBuildingItem.java similarity index 91% rename from common/buildcraft/core/blueprints/IBuilingItem.java rename to common/buildcraft/core/blueprints/IBuildingItem.java index 975fbec1..c817f068 100755 --- a/common/buildcraft/core/blueprints/IBuilingItem.java +++ b/common/buildcraft/core/blueprints/IBuildingItem.java @@ -8,6 +8,6 @@ */ package buildcraft.core.blueprints; -public interface IBuilingItem { +public interface IBuildingItem { boolean isDone(); } diff --git a/common/buildcraft/builders/IBuildingItemsProvider.java b/common/buildcraft/core/blueprints/IBuildingItemsProvider.java similarity index 92% rename from common/buildcraft/builders/IBuildingItemsProvider.java rename to common/buildcraft/core/blueprints/IBuildingItemsProvider.java index a0ed7bff..b067af77 100755 --- a/common/buildcraft/builders/IBuildingItemsProvider.java +++ b/common/buildcraft/core/blueprints/IBuildingItemsProvider.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders; +package buildcraft.core.blueprints; import java.util.ArrayList; diff --git a/common/buildcraft/builders/TileAbstractBuilder.java b/common/buildcraft/core/blueprints/TileAbstractBuilder.java similarity index 99% rename from common/buildcraft/builders/TileAbstractBuilder.java rename to common/buildcraft/core/blueprints/TileAbstractBuilder.java index 7988a17c..26ca58b9 100755 --- a/common/buildcraft/builders/TileAbstractBuilder.java +++ b/common/buildcraft/core/blueprints/TileAbstractBuilder.java @@ -6,14 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders; +package buildcraft.core.blueprints; import java.util.ArrayList; import java.util.LinkedList; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.ITileBuilder; import buildcraft.api.blueprints.SchematicRegistry; import buildcraft.api.core.NetworkData; diff --git a/common/buildcraft/builders/filler/pattern/FillerPattern.java b/common/buildcraft/core/blueprints/patterns/FillerPattern.java similarity index 98% rename from common/buildcraft/builders/filler/pattern/FillerPattern.java rename to common/buildcraft/core/blueprints/patterns/FillerPattern.java index e31ef458..b95cadb1 100644 --- a/common/buildcraft/builders/filler/pattern/FillerPattern.java +++ b/common/buildcraft/core/blueprints/patterns/FillerPattern.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import java.util.Map; import java.util.TreeMap; diff --git a/common/buildcraft/builders/filler/FillerRegistry.java b/common/buildcraft/core/blueprints/patterns/FillerRegistry.java similarity index 94% rename from common/buildcraft/builders/filler/FillerRegistry.java rename to common/buildcraft/core/blueprints/patterns/FillerRegistry.java index 380b9855..39de5e69 100644 --- a/common/buildcraft/builders/filler/FillerRegistry.java +++ b/common/buildcraft/core/blueprints/patterns/FillerRegistry.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler; +package buildcraft.core.blueprints.patterns; import java.util.HashSet; import java.util.Map.Entry; @@ -15,7 +15,6 @@ import java.util.TreeMap; import buildcraft.api.filler.IFillerPattern; import buildcraft.api.filler.IFillerRegistry; -import buildcraft.builders.filler.pattern.FillerPattern; import buildcraft.builders.triggers.ActionFiller; public class FillerRegistry implements IFillerRegistry { diff --git a/common/buildcraft/builders/filler/pattern/PatternBox.java b/common/buildcraft/core/blueprints/patterns/PatternBox.java similarity index 96% rename from common/buildcraft/builders/filler/pattern/PatternBox.java rename to common/buildcraft/core/blueprints/patterns/PatternBox.java index 64096c11..b6f8a35b 100644 --- a/common/buildcraft/builders/filler/pattern/PatternBox.java +++ b/common/buildcraft/core/blueprints/patterns/PatternBox.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; import buildcraft.core.Box; diff --git a/common/buildcraft/builders/filler/pattern/PatternClear.java b/common/buildcraft/core/blueprints/patterns/PatternClear.java similarity index 95% rename from common/buildcraft/builders/filler/pattern/PatternClear.java rename to common/buildcraft/core/blueprints/patterns/PatternClear.java index 76a0442e..fbff6ebd 100644 --- a/common/buildcraft/builders/filler/pattern/PatternClear.java +++ b/common/buildcraft/core/blueprints/patterns/PatternClear.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; import buildcraft.core.Box; diff --git a/common/buildcraft/builders/filler/pattern/PatternCylinder.java b/common/buildcraft/core/blueprints/patterns/PatternCylinder.java similarity index 98% rename from common/buildcraft/builders/filler/pattern/PatternCylinder.java rename to common/buildcraft/core/blueprints/patterns/PatternCylinder.java index 2680c7c3..07161693 100644 --- a/common/buildcraft/builders/filler/pattern/PatternCylinder.java +++ b/common/buildcraft/core/blueprints/patterns/PatternCylinder.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; import buildcraft.core.Box; diff --git a/common/buildcraft/builders/filler/pattern/PatternFill.java b/common/buildcraft/core/blueprints/patterns/PatternFill.java similarity index 94% rename from common/buildcraft/builders/filler/pattern/PatternFill.java rename to common/buildcraft/core/blueprints/patterns/PatternFill.java index fee802d1..4df72b1e 100644 --- a/common/buildcraft/builders/filler/pattern/PatternFill.java +++ b/common/buildcraft/core/blueprints/patterns/PatternFill.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; diff --git a/common/buildcraft/builders/filler/pattern/PatternFlatten.java b/common/buildcraft/core/blueprints/patterns/PatternFlatten.java similarity index 96% rename from common/buildcraft/builders/filler/pattern/PatternFlatten.java rename to common/buildcraft/core/blueprints/patterns/PatternFlatten.java index 799bb1f2..e4174d3a 100644 --- a/common/buildcraft/builders/filler/pattern/PatternFlatten.java +++ b/common/buildcraft/core/blueprints/patterns/PatternFlatten.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; diff --git a/common/buildcraft/builders/filler/pattern/PatternFrame.java b/common/buildcraft/core/blueprints/patterns/PatternFrame.java similarity index 97% rename from common/buildcraft/builders/filler/pattern/PatternFrame.java rename to common/buildcraft/core/blueprints/patterns/PatternFrame.java index 09eae4b9..59181c3f 100755 --- a/common/buildcraft/builders/filler/pattern/PatternFrame.java +++ b/common/buildcraft/core/blueprints/patterns/PatternFrame.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; diff --git a/common/buildcraft/builders/filler/pattern/PatternHorizon.java b/common/buildcraft/core/blueprints/patterns/PatternHorizon.java similarity index 96% rename from common/buildcraft/builders/filler/pattern/PatternHorizon.java rename to common/buildcraft/core/blueprints/patterns/PatternHorizon.java index cdac4d8c..b04ad82e 100644 --- a/common/buildcraft/builders/filler/pattern/PatternHorizon.java +++ b/common/buildcraft/core/blueprints/patterns/PatternHorizon.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; diff --git a/common/buildcraft/builders/filler/pattern/PatternPyramid.java b/common/buildcraft/core/blueprints/patterns/PatternPyramid.java similarity index 97% rename from common/buildcraft/builders/filler/pattern/PatternPyramid.java rename to common/buildcraft/core/blueprints/patterns/PatternPyramid.java index b8dfb0cc..543af23b 100644 --- a/common/buildcraft/builders/filler/pattern/PatternPyramid.java +++ b/common/buildcraft/core/blueprints/patterns/PatternPyramid.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; diff --git a/common/buildcraft/builders/filler/pattern/PatternStairs.java b/common/buildcraft/core/blueprints/patterns/PatternStairs.java similarity index 98% rename from common/buildcraft/builders/filler/pattern/PatternStairs.java rename to common/buildcraft/core/blueprints/patterns/PatternStairs.java index ffa44733..132c5cde 100644 --- a/common/buildcraft/builders/filler/pattern/PatternStairs.java +++ b/common/buildcraft/core/blueprints/patterns/PatternStairs.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.filler.pattern; +package buildcraft.core.blueprints.patterns; import net.minecraft.world.World; diff --git a/common/buildcraft/builders/urbanism/RenderBoxProvider.java b/common/buildcraft/core/render/RenderBoxProvider.java similarity index 97% rename from common/buildcraft/builders/urbanism/RenderBoxProvider.java rename to common/buildcraft/core/render/RenderBoxProvider.java index 0765a337..08ce05aa 100755 --- a/common/buildcraft/builders/urbanism/RenderBoxProvider.java +++ b/common/buildcraft/core/render/RenderBoxProvider.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.urbanism; +package buildcraft.core.render; import org.lwjgl.opengl.GL11; @@ -14,12 +14,10 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import buildcraft.core.Box; import buildcraft.core.DefaultProps; import buildcraft.core.IBoxProvider; import buildcraft.core.IBoxesProvider; -import buildcraft.core.render.RenderBox; public class RenderBoxProvider extends TileEntitySpecialRenderer { diff --git a/common/buildcraft/builders/RenderBuilder.java b/common/buildcraft/core/render/RenderBuilder.java similarity index 92% rename from common/buildcraft/builders/RenderBuilder.java rename to common/buildcraft/core/render/RenderBuilder.java index c845143a..ebfd8bef 100755 --- a/common/buildcraft/builders/RenderBuilder.java +++ b/common/buildcraft/core/render/RenderBuilder.java @@ -6,17 +6,16 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders; +package buildcraft.core.render; import org.lwjgl.opengl.GL11; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; - -import buildcraft.builders.urbanism.RenderBoxProvider; +import buildcraft.builders.RenderBuildingItems; import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; -import buildcraft.core.render.RenderLaser; +import buildcraft.core.blueprints.TileAbstractBuilder; public class RenderBuilder extends RenderBoxProvider { diff --git a/common/buildcraft/core/robots/boards/BoardRobotBuilder.java b/common/buildcraft/core/robots/boards/BoardRobotBuilder.java index de663264..c7cf2f68 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotBuilder.java +++ b/common/buildcraft/core/robots/boards/BoardRobotBuilder.java @@ -12,13 +12,12 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.builders.BuildingItem; import buildcraft.builders.TileConstructionMarker; +import buildcraft.core.blueprints.BuildingItem; import buildcraft.core.blueprints.BuildingSlot; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.robots.AIRobotGotoBlock; diff --git a/common/buildcraft/energy/EnergyProxyClient.java b/common/buildcraft/energy/EnergyProxyClient.java index f0dc84e2..8bd6263e 100644 --- a/common/buildcraft/energy/EnergyProxyClient.java +++ b/common/buildcraft/energy/EnergyProxyClient.java @@ -9,10 +9,9 @@ package buildcraft.energy; import cpw.mods.fml.client.registry.ClientRegistry; - import buildcraft.BuildCraftEnergy; -import buildcraft.builders.urbanism.RenderBoxProvider; import buildcraft.builders.urbanism.TileUrbanist; +import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; import buildcraft.energy.render.RenderEnergyEmitter; diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index c109f869..50b35942 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -12,14 +12,12 @@ import java.lang.reflect.Method; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; - import buildcraft.BuildCraftFactory; import buildcraft.api.core.BCLog; -import buildcraft.builders.RenderBuilder; import buildcraft.core.EntityBlock; +import buildcraft.core.render.RenderBuilder; import buildcraft.core.render.RenderVoid; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 89f95e2e..da1515d9 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -25,12 +25,10 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.BuildCraftAPI; @@ -39,8 +37,6 @@ import buildcraft.api.core.NetworkData; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.filler.FillerManager; import buildcraft.api.gates.IAction; -import buildcraft.builders.TileAbstractBuilder; -import buildcraft.builders.filler.pattern.FillerPattern; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.CoreConstants; @@ -49,6 +45,8 @@ import buildcraft.core.IMachine; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BptBuilderBase; import buildcraft.core.blueprints.BptBuilderBlueprint; +import buildcraft.core.blueprints.TileAbstractBuilder; +import buildcraft.core.blueprints.patterns.FillerPattern; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil;