tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Made AL a sub of the Dark-Core

Browse source
This commit is contained in:
DarkGuardsman 2013-07-21 23:56:26 -04:00
parent 612e1cfe26
commit 7acf0a5642
26 changed files with 80 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/assemblyline/client/SoundHandler.java
View file

@ -15,7 +15,7 @@ public class SoundHandler
{
for (int i = 0; i < SOUND_FILES.length; i++)
{
event.manager.soundPoolSounds.addSound(AssemblyLine.DIRECTORY_NO_SLASH + SOUND_FILES[i]);
event.manager.soundPoolSounds.addSound(AssemblyLine.instance.DIRECTORY_NO_SLASH + SOUND_FILES[i]);
}
}
}

2
src/minecraft/assemblyline/client/gui/GuiAutoCrafting.java
View file

@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiAutoCrafting extends GuiContainer
{
private static final ResourceLocation gui_pic = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_crafting.png");
private static final ResourceLocation gui_pic = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_crafting.png");
public GuiAutoCrafting(InventoryPlayer par1InventoryPlayer, World par2World, int par3, int par4, int par5)
{

2
src/minecraft/assemblyline/client/gui/GuiEncoder.java
View file

@ -310,7 +310,7 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.func_110434_K().func_110577_a( new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder.png"));
this.mc.func_110434_K().func_110577_a( new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder.png"));
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.drawTexturedModalRect(containerWidth, containerHeight + ContainerEncoder.Y_OFFSET, 0, 0, this.xSize, this.ySize);

2
src/minecraft/assemblyline/client/gui/GuiImprinter.java
View file

@ -37,7 +37,7 @@ public class GuiImprinter extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.func_110434_K().func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_imprinter.png"));
this.mc.func_110434_K().func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_imprinter.png"));
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.containerWidth = (this.width - this.xSize) / 2;
this.containerHeight = (this.height - this.ySize) / 2;

12
src/minecraft/assemblyline/client/render/BlockRenderingHandler.java
View file

@ -34,13 +34,13 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslatef((float) 0.0F, (float) 1.5F, (float) 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame0.png"));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame0.png"));
modelConveyorBelt.render(0.0625F, 0, false, false, false, false);
GL11.glPopMatrix();
}
else if (block.blockID == AssemblyLine.blockRejector.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png"));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png"));
GL11.glPushMatrix();
GL11.glTranslatef((float) 0.6F, (float) 1.5F, (float) 0.6F);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -51,7 +51,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (block.blockID == AssemblyLine.blockManipulator.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png"));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png"));
GL11.glPushMatrix();
GL11.glTranslatef((float) 0.6F, (float) 1.5F, (float) 0.6F);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -61,7 +61,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (block.blockID == AssemblyLine.blockArmbot.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
GL11.glPushMatrix();
GL11.glTranslatef(0.4f, 0.8f, 0f);
GL11.glScalef(0.7f, 0.7f, 0.7f);
@ -72,7 +72,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (block.blockID == AssemblyLine.blockCraneController.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderCraneController.TEXTURE));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderCraneController.TEXTURE));
GL11.glPushMatrix();
GL11.glTranslatef(0f, 1f, 0f);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -82,7 +82,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (block.blockID == AssemblyLine.blockCraneFrame.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderCraneFrame.TEXTURE));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderCraneFrame.TEXTURE));
GL11.glPushMatrix();
GL11.glTranslatef(0f, 1f, 0f);
GL11.glRotatef(180f, 0f, 0f, 1f);

2
src/minecraft/assemblyline/client/render/RenderArmbot.java
View file

@ -43,7 +43,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer
}
}
}
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
func_110628_a(name);
GL11.glPushMatrix();

8
src/minecraft/assemblyline/client/render/RenderConveyorBelt.java
View file

@ -52,7 +52,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
if (slantType == SlantType.UP)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
func_110628_a(name);
GL11.glTranslatef(0f, 0.8f, -0.8f);
@ -74,7 +74,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
}
else if (slantType == SlantType.DOWN)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
func_110628_a(name);
GL11.glRotatef(180f, 0f, 1f, 0f);
boolean slantAdjust = false;
@ -95,7 +95,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
}
else
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
func_110628_a(name);
GL11.glRotatef(180, 0f, 1f, 0f);
GL11.glTranslatef(0f, -0.68f, 0f);
@ -119,7 +119,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
GL11.glRotatef(90f, 0f, 1f, 0f);
break;
}
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
func_110628_a(name);
MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), tileEntity.getIsLastBelt(), tileEntity.getIsFirstBelt(), false, true);

2
src/minecraft/assemblyline/client/render/RenderCraneController.java
View file

@ -25,7 +25,7 @@ public class RenderCraneController extends RenderImprintable
{
if (tileEntity != null && tileEntity instanceof TileEntityCraneController)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY+(((TileEntityCraneController) tileEntity).isCraneValid() ? TEXTURE_VALID : TEXTURE));
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY+(((TileEntityCraneController) tileEntity).isCraneValid() ? TEXTURE_VALID : TEXTURE));
func_110628_a(name);
ForgeDirection front = ForgeDirection.getOrientation(tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
ForgeDirection right = CraneHelper.rotateClockwise(front);

2
src/minecraft/assemblyline/client/render/RenderCraneFrame.java
View file

@ -42,7 +42,7 @@ public class RenderCraneFrame extends TileEntitySpecialRenderer
boolean renderFoot = tileEntity.worldObj.isBlockSolidOnSide(tX, tY - 1, tZ, ForgeDirection.UP);
if ((renderLeft && renderRight) || (renderFront && renderBack))
renderFoot = false;
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
func_110628_a(name);
glPushMatrix();
glTranslated(x + 0.5, y + 1.5, z + 0.5);

4
src/minecraft/assemblyline/client/render/RenderManipulator.java
View file

@ -23,12 +23,12 @@ public class RenderManipulator extends RenderImprintable
if (tileEntity.isOutput())
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png");
func_110628_a(name);
}
else
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator2.png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator2.png");
func_110628_a(name);
}

2
src/minecraft/assemblyline/client/render/RenderRejector.java
View file

@ -23,7 +23,7 @@ public class RenderRejector extends RenderImprintable
{
pos = 8;
}
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png");
func_110628_a(name);
GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);

57
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -53,27 +53,25 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import dark.library.machine.BlockMulti;
import dark.library.machine.TileEntityMulti;
import dark.core.DarkMain;
import dark.core.ModPrefab;
import dark.prefab.machine.BlockMulti;
import dark.prefab.machine.TileEntityMulti;
@ModstatInfo(prefix = "asmline")
@Mod(modid = AssemblyLine.CHANNEL, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, dependencies = "after:BasicComponents; after:IC2", useMetadata = true)
@Mod(modid = AssemblyLine.CHANNEL, name = AssemblyLine.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:DarkCore", useMetadata = true)
@NetworkMod(channels = { AssemblyLine.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class AssemblyLine
public class AssemblyLine extends ModPrefab
{
// @Mod Prerequisites
public static final String MAJOR_VERSION = "@MAJOR@";
public static final String MINOR_VERSION = "@MINOR@";
public static final String REVIS_VERSION = "@REVIS@";
public static final String BUILD_VERSION = "@BUILD@";
public AssemblyLine()
{
super("al");
// TODO Auto-generated constructor stub
}
// @Mod
public static final String MOD_ID = "AssemblyLine";
public static final String MOD_NAME = "Assembly Line";
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
public static final String DOMAIN = "al";
public static final String PREFIX = DOMAIN + ":";
// @NetworkMod
public static final String CHANNEL = "AssemblyLine";
@ -87,24 +85,12 @@ public class AssemblyLine
@Metadata(AssemblyLine.MOD_ID)
public static ModMetadata meta;
public static final String DIRECTORY_NO_SLASH = "assets/" + DOMAIN + "/";
public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
public static final String LANGUAGE_PATH = DIRECTORY + "languages/";
public static final String SOUND_PATH = DIRECTORY + "audio/";
public static final String TEXTURE_DIRECTORY = "textures/";
public static final String BLOCK_DIRECTORY = TEXTURE_DIRECTORY + "blocks/";
public static final String ITEM_DIRECTORY = TEXTURE_DIRECTORY + "items/";
public static final String MODEL_DIRECTORY = TEXTURE_DIRECTORY + "models/";
public static final String GUI_DIRECTORY = TEXTURE_DIRECTORY + "gui/";
//public static final String TEXTURE_NAME_PREFIX = "assemblyline:";
private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US", "nl_NL", "fr_FR", "de_DE" };
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "Dark/AssemblyLine.cfg"));
public static int BLOCK_ID_PREFIX = 3030;
public static Block blockConveyorBelt;
public static Block blockManipulator;
@ -118,9 +104,6 @@ public class AssemblyLine
public static Block blockCraneFrame;
public static Block blockTurntable;
public static BlockMulti blockMulti;
public static final int ITEM_ID_PREFIX = 13030;
public static Item itemImprint;
public static Item itemDisk;
@ -149,7 +132,6 @@ public class AssemblyLine
blockRejector = new BlockRejector(BLOCK_ID_PREFIX++);
blockEncoder = new BlockEncoder(BLOCK_ID_PREFIX++);
blockArmbot = new BlockArmbot(BLOCK_ID_PREFIX++);
blockMulti = new BlockMulti(AssemblyLine.CONFIGURATION.getBlock("blockMulti", BLOCK_ID_PREFIX++).getInt());
blockCraneController = new BlockCraneController(BLOCK_ID_PREFIX++);
blockCraneFrame = new BlockCraneFrame(BLOCK_ID_PREFIX++);
blockTurntable = new BlockTurntable(BLOCK_ID_PREFIX++);
@ -188,7 +170,6 @@ public class AssemblyLine
GameRegistry.registerTileEntity(TileEntityCraneController.class, "ALCraneController");
GameRegistry.registerTileEntity(TileEntityCraneRail.class, "ALCraneRail");
GameRegistry.registerTileEntity(TileEntityImprinter.class, "ALImprinter");
GameRegistry.registerTileEntity(TileEntityMulti.class, "ALMulti");
TabAssemblyLine.itemStack = new ItemStack(AssemblyLine.blockConveyorBelt);
@ -210,7 +191,7 @@ public class AssemblyLine
meta.url = "http://universalelectricity.com/assembly-line";
meta.logoFile = "/al_logo.png";
meta.version = AssemblyLine.VERSION;
meta.version = DarkMain.VERSION;
meta.authorList = Arrays.asList(new String[] { "DarkGuardsman" });
meta.credits = "Please see the website.";
meta.autogenerated = false;
@ -224,4 +205,18 @@ public class AssemblyLine
System.out.print(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT ? "[C]" : "[S]");
System.out.println(" " + data);
}
@Override
public void loadConfig()
{
// TODO Auto-generated method stub
}
@Override
public void loadModMeta()
{
// TODO Auto-generated method stub
}
}

2
src/minecraft/assemblyline/common/armbot/BlockArmbot.java
View file

@ -12,7 +12,7 @@ import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.machine.BlockAssembly;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.library.machine.IMultiBlock;
import dark.prefab.machine.IMultiBlock;
public class BlockArmbot extends BlockAssembly
{

7
src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java
View file

@ -40,8 +40,9 @@ import cpw.mods.fml.relauncher.Side;
import dan200.computer.api.IComputerAccess;
import dan200.computer.api.ILuaContext;
import dan200.computer.api.IPeripheral;
import dark.core.DarkMain;
import dark.helpers.ItemFindingHelper;
import dark.library.machine.IMultiBlock;
import dark.prefab.machine.IMultiBlock;
public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, IInventory, IPacketReceiver, IArmbot, IPeripheral
{
@ -588,7 +589,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
@Override
public void onCreate(Vector3 placedPosition)
{
AssemblyLine.blockMulti.makeFakeBlock(this.worldObj, Vector3.add(placedPosition, new Vector3(0, 1, 0)), placedPosition);
DarkMain.blockMulti.makeFakeBlock(this.worldObj, Vector3.add(placedPosition, new Vector3(0, 1, 0)), placedPosition);
}
@Override
@ -611,7 +612,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
}
@Override
public Object[] callMethod( IComputerAccess computer, ILuaContext context, int method, Object[] arguments ) throws Exception
public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception
{
switch (method)
{

6
src/minecraft/assemblyline/common/imprinter/BlockImprinter.java
View file

@ -33,9 +33,9 @@ public class BlockImprinter extends BlockAssembly
@Override
public void registerIcons(IconRegister iconReg)
{
this.imprinter_side = iconReg.registerIcon(AssemblyLine.PREFIX + "imprinter_side");
this.imprinter_top = iconReg.registerIcon(AssemblyLine.PREFIX + "imprinter_top");
this.imprinter_bottom = iconReg.registerIcon(AssemblyLine.PREFIX + "imprinter_bottom");
this.imprinter_side = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "imprinter_side");
this.imprinter_top = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "imprinter_top");
this.imprinter_bottom = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "imprinter_bottom");
}
@Override

2
src/minecraft/assemblyline/common/imprinter/ItemImprinter.java
View file

@ -33,7 +33,7 @@ public class ItemImprinter extends Item
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "imprint");
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.instance.PREFIX + "imprint");
}
@Override

6
src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java
View file

@ -29,9 +29,9 @@ import com.google.common.io.ByteArrayDataInput;
import dark.helpers.Pair;
import dark.library.gui.ISlotPickResult;
import dark.library.machine.AutoCraftingManager;
import dark.library.machine.IAutoCrafter;
import dark.library.machine.TileEntityMulti;
import dark.prefab.machine.AutoCraftingManager;
import dark.prefab.machine.IAutoCrafter;
import dark.prefab.machine.TileEntityMulti;
public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInventory, IArmbotUseable, IPacketReceiver, ISlotPickResult, IAutoCrafter
{

4
src/minecraft/assemblyline/common/machine/BlockAssembly.java
View file

@ -10,8 +10,8 @@ import assemblyline.common.AssemblyLine;
import assemblyline.common.TabAssemblyLine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.api.INetworkPart;
import dark.library.machine.BlockMachine;
import dark.api.INetworkPart;
import dark.prefab.machine.BlockMachine;
public abstract class BlockAssembly extends BlockMachine
{

10
src/minecraft/assemblyline/common/machine/BlockCrate.java
View file

@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly;
/** A block that allows the placement of mass amount of a specific item within it. It will be allowed
* to go on Conveyor Belts
*
*
* @author Calclavia */
public class BlockCrate extends BlockAssembly
{
@ -34,7 +34,7 @@ public class BlockCrate extends BlockAssembly
@Override
public void registerIcons(IconRegister iconReg)
{
this.crate_icon = iconReg.registerIcon(AssemblyLine.PREFIX + "crate");
this.crate_icon = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "crate");
}
@Override
@ -208,7 +208,7 @@ public class BlockCrate extends BlockAssembly
}
/** Inserts all items of the same type this player has into the crate.
*
*
* @return True on success */
public boolean insertAllItems(TileEntityCrate tileEntity, EntityPlayer player)
{
@ -253,7 +253,7 @@ public class BlockCrate extends BlockAssembly
}
/** Ejects and item out of the crate and spawn it under the player entity.
*
*
* @param tileEntity
* @param player
* @param requestSize - The maximum stack size to take out. Default should be 64.
@ -305,7 +305,7 @@ public class BlockCrate extends BlockAssembly
}
/** Puts an itemStack into the crate.
*
*
* @param tileEntity
* @param itemStack */
public static ItemStack addStackToCrate(TileEntityCrate tileEntity, ItemStack itemStack)

2
src/minecraft/assemblyline/common/machine/BlockTurntable.java
View file

@ -34,7 +34,7 @@ public class BlockTurntable extends BlockAssembly
public void registerIcons(IconRegister iconReg)
{
super.registerIcons(iconReg);
this.top = iconReg.registerIcon(AssemblyLine.PREFIX + "turntable");
this.top = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "turntable");
}
@Override

2
src/minecraft/assemblyline/common/machine/InvInteractionHelper.java
View file

@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import dark.library.machine.TileEntityMulti;
import dark.prefab.machine.TileEntityMulti;
public class InvInteractionHelper
{

2
src/minecraft/assemblyline/common/machine/NetworkAssembly.java
View file

@ -1,6 +1,6 @@
package assemblyline.common.machine;
import dark.core.api.INetworkPart;
import dark.api.INetworkPart;
import dark.core.tile.network.NetworkTileEntities;
public class NetworkAssembly extends NetworkTileEntities

6
src/minecraft/assemblyline/common/machine/TileEntityAssembly.java
View file

@ -22,15 +22,15 @@ import assemblyline.common.AssemblyLine;
import com.google.common.io.ByteArrayDataInput;
import dark.core.api.INetworkPart;
import dark.api.INetworkPart;
import dark.core.tile.network.NetworkTileEntities;
import dark.library.machine.TileEntityRunnableMachine;
import dark.prefab.machine.TileEntityMachine;
/** A class to be inherited by all machines on the assembly line. This class acts as a single peace
* in a network of similar tiles allowing all to share power from one or more sources
*
* @author DarkGuardsman */
public abstract class TileEntityAssembly extends TileEntityRunnableMachine implements INetworkPart, IPacketReceiver, IConductor
public abstract class TileEntityAssembly extends TileEntityMachine implements INetworkPart, IPacketReceiver, IConductor
{
/** Is the tile currently powered allowing it to run */

4
src/minecraft/assemblyline/common/machine/detector/BlockDetector.java
View file

@ -67,8 +67,8 @@ public class BlockDetector extends BlockImprintable
public void registerIcons(IconRegister iconReg)
{
super.registerIcons(iconReg);
this.eye_green = iconReg.registerIcon(AssemblyLine.PREFIX + "detector_green");
this.eye_red = iconReg.registerIcon(AssemblyLine.PREFIX + "detector_red");
this.eye_green = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "detector_green");
this.eye_red = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "detector_red");
}
@Override

10
src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java
View file

@ -27,11 +27,11 @@ public class BlockEncoder extends BlockAssembly
@Override
public void registerIcons(IconRegister iconReg)
{
this.encoder_side = iconReg.registerIcon(AssemblyLine.PREFIX+"encoder_side");
this.encoder_top = iconReg.registerIcon(AssemblyLine.PREFIX+"encoder_top");
this.encoder_bottom = iconReg.registerIcon(AssemblyLine.PREFIX+"encoder_bottom");
this.encoder_side = iconReg.registerIcon(AssemblyLine.instance.PREFIX+"encoder_side");
this.encoder_top = iconReg.registerIcon(AssemblyLine.instance.PREFIX+"encoder_top");
this.encoder_bottom = iconReg.registerIcon(AssemblyLine.instance.PREFIX+"encoder_bottom");
}
/**
* Returns the block texture based on the side being looked at. Args: side
*/
@ -40,7 +40,7 @@ public class BlockEncoder extends BlockAssembly
{
return getIcon(side, 0);
}
/**
* Returns the block texture based on the side being looked at. Args: side
*/

4
src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java
View file

@ -23,12 +23,12 @@ public class ItemDisk extends Item
this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setHasSubtypes(true);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "disk");
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.instance.PREFIX + "disk");
}
@Override