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

Clean up and import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-18 14:54:54 -05:00
parent e8dd09ab68
commit 82f65af734
31 changed files with 97 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dark/api/al/coding/ITask.java
View file

@ -2,12 +2,12 @@ package dark.api.al.coding;
import java.util.List;
import com.dark.save.ISaveObj;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import universalelectricity.core.vector.Vector2;
import com.dark.save.ISaveObj;
import dark.api.al.coding.args.ArgumentData;
/** @author DarkGuardsman */

4
src/dark/api/al/coding/args/ArgumentData.java
View file

@ -1,10 +1,10 @@
package dark.api.al.coding.args;
import net.minecraft.nbt.NBTTagCompound;
import com.dark.save.ISaveObj;
import com.dark.save.NBTFileHelper;
import net.minecraft.nbt.NBTTagCompound;
/** Used to store arguments in a way that can be easier to read, limit, and understand
*
* @author DarkGuardsman */

8
src/dark/assembly/AssemblyLine.java
View file

@ -9,9 +9,11 @@ import net.minecraftforge.common.Configuration;
import org.modstats.ModstatInfo;
import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore;
import com.dark.ModObjectRegistry;
import universalelectricity.prefab.TranslationHelper;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@ -171,8 +173,8 @@ public class AssemblyLine extends ModPrefab
ALRecipeLoader.processorMachine = ModObjectRegistry.createNewBlock("ALBlockProcessor", AssemblyLine.MOD_ID, BlockProcessor.class, ItemBlockHolder.class);
ALRecipeLoader.blockAdvancedHopper = ModObjectRegistry.createNewBlock("ALBlockHopper", AssemblyLine.MOD_ID, BlockAdvancedHopper.class, ItemBlockHolder.class);
ALRecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", ITEM_ID_PREFIX).getInt());
ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", ITEM_ID_PREFIX + 1).getInt());
ALRecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());
AssemblyLine.VINALLA_RECIPES = CONFIGURATION.get("general", "Vinalla_Recipes", false).getBoolean(false);

3
src/dark/assembly/armbot/BlockArmbot.java
View file

@ -13,7 +13,6 @@ import universalelectricity.core.UniversalElectricity;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -26,7 +25,7 @@ public class BlockArmbot extends BlockAssembly
{
public BlockArmbot()
{
super(new BlockBuildData(BlockArmbot.class, "armbot", UniversalElectricity.machine));
super("armbot", UniversalElectricity.machine);
}
@Override

6
src/dark/assembly/armbot/Program.java
View file

@ -5,12 +5,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import com.dark.save.NBTFileHelper;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import universalelectricity.core.vector.Vector2;
import com.dark.save.NBTFileHelper;
import dark.api.al.coding.IProgram;
import dark.api.al.coding.IProgrammableMachine;
import dark.api.al.coding.ITask;

6
src/dark/assembly/armbot/TaskBase.java
View file

@ -3,12 +3,12 @@ package dark.assembly.armbot;
import java.util.ArrayList;
import java.util.List;
import com.dark.save.NBTFileHelper;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import universalelectricity.core.vector.Vector2;
import com.dark.save.NBTFileHelper;
import dark.api.al.coding.IProgram;
import dark.api.al.coding.IProgrammableMachine;
import dark.api.al.coding.ITask;

5
src/dark/assembly/client/gui/GuiEditTask.java
View file

@ -9,6 +9,9 @@ import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector2;
import com.dark.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import dark.api.al.coding.ITask;
@ -20,7 +23,7 @@ import dark.core.prefab.invgui.IMessageBoxDialog;
public class GuiEditTask extends GuiBase implements IMessageBoxDialog
{
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_task_edit.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.GUI_DIRECTORY + "gui_task_edit.png");
protected GuiEncoderCoder gui;
protected ITask task, editTask;

5
src/dark/assembly/client/gui/GuiEncoderHelp.java
View file

@ -2,12 +2,15 @@ package dark.assembly.client.gui;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
import com.dark.DarkCore;
import dark.assembly.AssemblyLine;
import dark.assembly.machine.encoder.TileEntityEncoder;
public class GuiEncoderHelp extends GuiEncoderBase
{
public static final ResourceLocation TEXTURE_CODE_BACK = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder_coder.png");
public static final ResourceLocation TEXTURE_CODE_BACK = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.GUI_DIRECTORY + "gui_encoder_coder.png");
public GuiEncoderHelp(InventoryPlayer player, TileEntityEncoder tileEntity)
{

4
src/dark/assembly/client/gui/GuiEncoderInventory.java
View file

@ -5,6 +5,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -15,7 +17,7 @@ import dark.assembly.machine.encoder.TileEntityEncoder;
@SideOnly(Side.CLIENT)
public class GuiEncoderInventory extends GuiEncoderBase
{
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder_slot.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.GUI_DIRECTORY + "gui_encoder_slot.png");
public GuiEncoderInventory(InventoryPlayer inventoryPlayer, TileEntityEncoder tileEntity)
{

6
src/dark/assembly/client/gui/GuiImprinter.java
View file

@ -7,12 +7,14 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.imprinter.ContainerImprinter;
import dark.assembly.imprinter.TileEntityImprinter;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class GuiImprinter extends GuiContainer
@ -41,7 +43,7 @@ public class GuiImprinter extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.GUI_DIRECTORY + "gui_imprinter.png"));
this.mc.renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.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;

4
src/dark/assembly/client/gui/GuiProcessor.java
View file

@ -7,6 +7,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
@ -16,7 +18,7 @@ import dark.assembly.machine.processor.TileEntityProcessor;
@SideOnly(Side.CLIENT)
public class GuiProcessor extends GuiContainer
{
private static final ResourceLocation gui_texture = new ResourceLocation(AssemblyLine.instance.PREFIX + AssemblyLine.GUI_DIRECTORY + "processor.png");
private static final ResourceLocation gui_texture = new ResourceLocation(AssemblyLine.instance.PREFIX + DarkCore.GUI_DIRECTORY + "processor.png");
private TileEntityProcessor tileEntity;
public GuiProcessor(InventoryPlayer par1InventoryPlayer, TileEntityProcessor par2TileEntityFurnace)

14
src/dark/assembly/client/gui/GuiTask.java
View file

@ -7,18 +7,18 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.al.coding.IRedirectTask;
import dark.api.al.coding.ITask;
import dark.core.prefab.ModPrefab;
import dark.machines.DarkMain;
@SideOnly(Side.CLIENT)
public class GuiTask extends Gui
{
boolean isLeft = false;
private ResourceLocation gui_pic = new ResourceLocation(DarkMain.GUI_DIRECTORY + "gui@.png");
private ResourceLocation gui_pic = new ResourceLocation(DarkCore.GUI_DIRECTORY + "gui@.png");
/** Button width in pixels */
protected int width;
@ -54,16 +54,16 @@ public class GuiTask extends Gui
switch (task.getType())
{
case DATA:
gui_pic = new ResourceLocation(ModPrefab.GUI_DIRECTORY + "logic/DATA.png");
gui_pic = new ResourceLocation(DarkCore.GUI_DIRECTORY + "logic/DATA.png");
break;
case PROCESS:
gui_pic = new ResourceLocation(ModPrefab.GUI_DIRECTORY + "logic/PROCESS.png");
gui_pic = new ResourceLocation(DarkCore.GUI_DIRECTORY + "logic/PROCESS.png");
break;
case DEFINEDPROCESS:
gui_pic = new ResourceLocation(ModPrefab.GUI_DIRECTORY + "logic/DEFINEDPROCESS.png");
gui_pic = new ResourceLocation(DarkCore.GUI_DIRECTORY + "logic/DEFINEDPROCESS.png");
break;
case DECISION:
gui_pic = new ResourceLocation(ModPrefab.GUI_DIRECTORY + "logic/IF.png");
gui_pic = new ResourceLocation(DarkCore.GUI_DIRECTORY + "logic/IF.png");
break;
}
}

15
src/dark/assembly/client/render/BlockRenderingHandler.java
View file

@ -7,6 +7,8 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -20,7 +22,6 @@ import dark.assembly.client.model.ModelGrinder;
import dark.assembly.client.model.ModelManipulator;
import dark.assembly.client.model.ModelRejectorPiston;
import dark.assembly.machine.red.BlockAdvancedHopper;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
@ -41,13 +42,13 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslatef(0.0F, 1.5F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "belt/frame0.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "belt/frame0.png"));
modelConveyorBelt.render(0.0625F, 0, false, false, false, false);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.blockRejector != null && block.blockID == ALRecipeLoader.blockRejector.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "rejector.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "rejector.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0.6F, 1.5F, 0.6F);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -58,7 +59,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (ALRecipeLoader.blockManipulator != null && block.blockID == ALRecipeLoader.blockManipulator.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "manipulator1.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "manipulator1.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0.6F, 1.5F, 0.6F);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -68,7 +69,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (ALRecipeLoader.blockArmbot != null && block.blockID == ALRecipeLoader.blockArmbot.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
GL11.glPushMatrix();
GL11.glTranslatef(0.4f, 0.8f, 0f);
GL11.glScalef(0.7f, 0.7f, 0.7f);
@ -79,7 +80,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (ALRecipeLoader.processorMachine != null && block.blockID == ALRecipeLoader.processorMachine.blockID && metadata == 0)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "CrusherBlock.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "CrusherBlock.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0f, 1f, 0f);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -90,7 +91,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
}
else if (ALRecipeLoader.processorMachine != null && block.blockID == ALRecipeLoader.processorMachine.blockID && metadata == 4)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "GrinderBlock.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "GrinderBlock.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0f, 1f, 0f);
GL11.glRotatef(180f, 0f, 0f, 1f);

5
src/dark/assembly/client/render/RenderAdvancedHopper.java
View file

@ -6,18 +6,19 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.model.ModelAdvancedHopper;
import dark.assembly.machine.red.TileEntityAdvancedHopper;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class RenderAdvancedHopper extends RenderImprintable
{
private static final ModelAdvancedHopper MODEL = new ModelAdvancedHopper();
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "AdvancedHopper.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "AdvancedHopper.png");
private void renderAModelAt(TileEntityAdvancedHopper tileEntity, double x, double y, double z, float f)
{

6
src/dark/assembly/client/render/RenderArmbot.java
View file

@ -15,12 +15,14 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.armbot.TileEntityArmbot;
import dark.assembly.client.model.ModelArmbot;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class RenderArmbot extends TileEntitySpecialRenderer
@ -47,7 +49,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer
}
}
}
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + TEXTURE);
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + TEXTURE);
bindTexture(name);
GL11.glPushMatrix();

11
src/dark/assembly/client/render/RenderConveyorBelt.java
View file

@ -6,6 +6,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
@ -13,7 +15,6 @@ import dark.assembly.client.model.ModelAngledBelt;
import dark.assembly.client.model.ModelConveyorBelt;
import dark.assembly.machine.belt.TileEntityConveyorBelt;
import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class RenderConveyorBelt extends TileEntitySpecialRenderer
@ -53,7 +54,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
if (slantType == SlantType.UP)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
bindTexture(name);
GL11.glTranslatef(0f, 0.8f, -0.8f);
@ -75,7 +76,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
}
else if (slantType == SlantType.DOWN)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
bindTexture(name);
GL11.glRotatef(180f, 0f, 1f, 0f);
boolean slantAdjust = false;
@ -96,7 +97,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
}
else
{
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
bindTexture(name);
GL11.glRotatef(180, 0f, 1f, 0f);
GL11.glTranslatef(0f, -0.68f, 0f);
@ -120,7 +121,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
GL11.glRotatef(90f, 0f, 1f, 0f);
break;
}
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
bindTexture(name);
MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), tileEntity.getIsLastBelt(), tileEntity.getIsFirstBelt(), false, true);

7
src/dark/assembly/client/render/RenderManipulator.java
View file

@ -5,12 +5,13 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.model.ModelManipulator;
import dark.assembly.machine.TileEntityManipulator;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class RenderManipulator extends RenderImprintable
@ -27,12 +28,12 @@ public class RenderManipulator extends RenderImprintable
if (tileEntity.isOutput())
{
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "manipulator1.png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "manipulator1.png");
bindTexture(name);
}
else
{
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "manipulator2.png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "manipulator2.png");
bindTexture(name);
}

7
src/dark/assembly/client/render/RenderProcessor.java
View file

@ -6,13 +6,14 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.model.ModelCrusher;
import dark.assembly.client.model.ModelGrinder;
import dark.assembly.machine.processor.TileEntityProcessor;
import dark.core.prefab.ModPrefab;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
@ -88,11 +89,11 @@ public class RenderProcessor extends RenderTileMachine
int g = meta / 4;
if (g == 0)
{
return new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "CrusherBlock.png");
return new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "CrusherBlock.png");
}
else if (g == 1)
{
return new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "GrinderBlock.png");
return new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "GrinderBlock.png");
}
return null;

5
src/dark/assembly/client/render/RenderRejector.java
View file

@ -5,12 +5,13 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.model.ModelRejectorPiston;
import dark.assembly.machine.TileEntityRejector;
import dark.core.prefab.ModPrefab;
@SideOnly(Side.CLIENT)
public class RenderRejector extends RenderImprintable
@ -27,7 +28,7 @@ public class RenderRejector extends RenderImprintable
{
pos = 8;
}
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "rejector.png");
ResourceLocation name = new ResourceLocation(AssemblyLine.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "rejector.png");
bindTexture(name);
GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);

3
src/dark/assembly/imprinter/BlockImprinter.java
View file

@ -15,7 +15,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -31,7 +30,7 @@ public class BlockImprinter extends BlockAssembly
public BlockImprinter()
{
super(new BlockBuildData(BlockImprinter.class, "imprinter", Material.wood));
super("imprinter", Material.wood);
}
@SideOnly(Side.CLIENT)

10
src/dark/assembly/imprinter/prefab/BlockImprintable.java
View file

@ -1,7 +1,6 @@
package dark.assembly.imprinter.prefab;
import com.dark.ModObjectRegistry.BlockBuildData;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -14,13 +13,14 @@ import dark.assembly.imprinter.ItemImprinter;
import dark.assembly.machine.BlockAssembly;
/** Extend this block class if a filter is allowed to be placed inside of this block.
*
*
* @author Calclavia */
public abstract class BlockImprintable extends BlockAssembly
{
public BlockImprintable(BlockBuildData data)
public BlockImprintable(String blockName, Material material)
{
super(data);
super(blockName, material);
}
/** Allows filters to be placed inside of this block. */

8
src/dark/assembly/machine/BlockAssembly.java
View file

@ -1,7 +1,5 @@
package dark.assembly.machine;
import com.dark.ModObjectRegistry.BlockBuildData;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -13,12 +11,6 @@ import dark.core.prefab.machine.BlockMachine;
public class BlockAssembly extends BlockMachine
{
public BlockAssembly(BlockBuildData buildBuildData)
{
super(buildBuildData.setCreativeTab(DMCreativeTab.tabAutomation()).setConfigProvider(AssemblyLine.CONFIGURATION));
}
public BlockAssembly(String blockName, Material material)
{
super(AssemblyLine.CONFIGURATION, blockName, material);

11
src/dark/assembly/machine/BlockCrate.java
View file

@ -18,7 +18,6 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -27,7 +26,7 @@ import dark.assembly.client.render.RenderCrate;
/** 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 DarkGuardsman */
public class BlockCrate extends BlockAssembly
{
@ -35,7 +34,7 @@ public class BlockCrate extends BlockAssembly
public BlockCrate()
{
super(new BlockBuildData(BlockCrate.class, "crate", UniversalElectricity.machine));
super("crate", UniversalElectricity.machine);
}
@SideOnly(Side.CLIENT)
@ -223,7 +222,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)
{
@ -268,7 +267,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.
@ -320,7 +319,7 @@ public class BlockCrate extends BlockAssembly
}
/** Puts an itemStack into the crate.
*
*
* @param tileEntity
* @param itemStack */
public static ItemStack addStackToCrate(TileEntityCrate tileEntity, ItemStack itemStack)

3
src/dark/assembly/machine/BlockDetector.java
View file

@ -17,7 +17,6 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -33,7 +32,7 @@ public class BlockDetector extends BlockImprintable
public BlockDetector()
{
super(new BlockBuildData(BlockDetector.class, "detector", UniversalElectricity.machine));
super("detector", UniversalElectricity.machine);
}
@Override

5
src/dark/assembly/machine/BlockManipulator.java
View file

@ -12,7 +12,6 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -22,13 +21,13 @@ import dark.assembly.client.render.RenderManipulator;
import dark.assembly.imprinter.prefab.BlockImprintable;
/** A block that manipulates item movement between inventories.
*
*
* @author Calclavia, DarkGuardsman */
public class BlockManipulator extends BlockImprintable
{
public BlockManipulator()
{
super(new BlockBuildData(BlockManipulator.class, "manipulator", UniversalElectricity.machine));
super("manipulator", UniversalElectricity.machine);
this.setBlockBounds(0, 0, 0, 1, 0.29f, 1);
this.guiID = CommonProxy.GUI_MANIPULATOR;
}

3
src/dark/assembly/machine/BlockRejector.java
View file

@ -11,7 +11,6 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -27,7 +26,7 @@ public class BlockRejector extends BlockImprintable
public BlockRejector()
{
super(new BlockBuildData(BlockRejector.class, "rejector", UniversalElectricity.machine));
super("rejector", UniversalElectricity.machine);
}
@Override

4
src/dark/assembly/machine/BlockTurntable.java
View file

@ -2,8 +2,6 @@ package dark.assembly.machine;
import java.util.Random;
import com.dark.ModObjectRegistry.BlockBuildData;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -28,7 +26,7 @@ public class BlockTurntable extends BlockAssembly
public BlockTurntable()
{
super(new BlockBuildData(BlockTurntable.class, "turntable", Material.piston));
super("turntable", Material.piston);
this.setTickRandomly(true);
}

6
src/dark/assembly/machine/belt/BlockConveyor.java
View file

@ -2,6 +2,7 @@ package dark.assembly.machine.belt;
import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -15,7 +16,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -29,9 +29,9 @@ import dark.machines.DarkMain;
public class BlockConveyor extends BlockAssembly
{
public BlockConveyor(BlockBuildData buildBuildData)
public BlockConveyor()
{
super(buildBuildData);
super("ConveyorBelt", Material.iron);
this.setBlockBounds(0, 0, 0, 1, 0.3f, 1);
}

5
src/dark/assembly/machine/belt/BlockConveyorBelt.java
View file

@ -19,7 +19,6 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -30,13 +29,13 @@ import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.machines.DarkMain;
/** The block for the actual conveyor belt!
*
*
* @author Calclavia, DarkGuardsman */
public class BlockConveyorBelt extends BlockAssembly
{
public BlockConveyorBelt()
{
super(new BlockBuildData(BlockConveyorBelt.class, "conveyorBelt", UniversalElectricity.machine));
super("conveyorBelt", UniversalElectricity.machine);
this.setBlockBounds(0, 0, 0, 1, 0.3f, 1);
}

3
src/dark/assembly/machine/encoder/BlockEncoder.java
View file

@ -11,7 +11,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -27,7 +26,7 @@ public class BlockEncoder extends BlockAssembly
public BlockEncoder()
{
super(new BlockBuildData(BlockEncoder.class, "encoder", Material.wood));
super("encoder", Material.wood);
}
@SideOnly(Side.CLIENT)

3
src/dark/assembly/machine/processor/BlockProcessor.java
View file

@ -16,7 +16,6 @@ import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.ModObjectRegistry.BlockBuildData;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
@ -34,7 +33,7 @@ public class BlockProcessor extends BlockMachine
public BlockProcessor()
{
super(new BlockBuildData(BlockProcessor.class, "OreProcessor", UniversalElectricity.machine).setConfigProvider(AssemblyLine.CONFIGURATION));
super(AssemblyLine.CONFIGURATION, "OreProcessor", UniversalElectricity.machine);
this.setCreativeTab(DMCreativeTab.tabIndustrial());
}