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

Fixed Dark's Derp + Version Bump

Browse source
This commit is contained in:
Henry Mao 2013-01-30 18:07:16 +08:00
parent eb6a3a1d96
commit 48eba3bed2
11 changed files with 168 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
info.txt
View file

@ -1,64 +1,63 @@
@ AssemblyLine_v0.0.6.1.jar
@ AssemblyLine_v0.0.6.2.jar
@ AssemblyLine_v0.0.6.3.jar
* AssemblyLine_v0.0.6.5.jar
@ AssemblyLine_v0.0.6.6.jar
@ AssemblyLine_v0.0.6.7.jar
@ AssemblyLine_v0.0.6.8.jar AssemblyLine_v0.0.6.8_api.zip
@ AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip
Minecraft 1.3.2
* AssemblyLine_v0.1.2.10.jar AssemblyLine_v0.1.2.10_api.zip
Minecraft 1.4.2
@ AssemblyLine_v0.1.3.11.jar AssemblyLine_v0.1.3.11_api.zip
* AssemblyLine_v0.1.3.13.jar AssemblyLine_v0.1.3.13_api.zip
* AssemblyLine_v0.1.4.14.jar AssemblyLine_v0.1.4.14_api.zip
* AssemblyLine_v0.1.5.18.jar AssemblyLine_v0.1.5.18_api.zip
@ AssemblyLine_v0.1.6.19.jar AssemblyLine_v0.1.6.19_api.zip
@ AssemblyLine_v0.1.6.20.jar AssemblyLine_v0.1.6.20_api.zip
@ AssemblyLine_v0.1.6.21.jar AssemblyLine_v0.1.6.21_api.zip
x AssemblyLine_v0.1.6.22.jar AssemblyLine_v0.1.6.22_api.zip
x AssemblyLine_v0.1.6.23.jar AssemblyLine_v0.1.6.23_api.zip
* AssemblyLine_v0.1.6.24.jar AssemblyLine_v0.1.6.24_api.zip
@ AssemblyLine_v0.1.7.25.jar AssemblyLine_v0.1.7.25_api.zip
* AssemblyLine_v0.1.7.26.jar AssemblyLine_v0.1.7.26_api.zip
* AssemblyLine_v0.1.7.27.jar AssemblyLine_v0.1.7.27_api.zip
Minecraft 1.4.5
@ AssemblyLine_v0.1.8.28.jar AssemblyLine_v0.1.8.28_api.zip
@ AssemblyLine_v0.1.8.29.jar AssemblyLine_v0.1.8.29_api.zip
* AssemblyLine_v0.1.8.30.jar AssemblyLine_v0.1.8.30_api.zip
@ AssemblyLine_v0.1.8.31.jar AssemblyLine_v0.1.8.31_api.zip
@ AssemblyLine_v0.1.9.32.jar AssemblyLine_v0.1.9.32_api.zip
@ AssemblyLine_v0.1.9.33.jar AssemblyLine_v0.1.9.33_api.zip
@ AssemblyLine_v0.1.9.34.jar AssemblyLine_v0.1.9.34_api.zip
* AssemblyLine_v0.1.9.35.jar AssemblyLine_v0.1.9.35_api.zip
@ AssemblyLine_v0.1.9.36.jar AssemblyLine_v0.1.9.36_api.zip
@ AssemblyLine_v0.2.0.38.jar AssemblyLine_v0.2.0.38_api.zip
* AssemblyLine_v0.2.0.38.jar AssemblyLine_v0.2.0.38_api.zip
@ AssemblyLine_v0.2.1.39.jar AssemblyLine_v0.2.1.39_api.zip
* AssemblyLine_v0.2.1.40.jar AssemblyLine_v0.2.1.40_api.zip
@ AssemblyLine_v0.2.2.41.jar AssemblyLine_v0.2.2.41_api.zip
@ AssemblyLine_v0.2.2.42.jar AssemblyLine_v0.2.2.42_api.zip
@ AssemblyLine_v0.2.2.43.jar AssemblyLine_v0.2.2.43_api.zip
* AssemblyLine_v0.2.2.44.jar AssemblyLine_v0.2.2.44_api.zip
@ AssemblyLine_v0.2.3.47.jar AssemblyLine_v0.2.3.47_api.zip
@ AssemblyLine_v0.2.3.48.jar AssemblyLine_v0.2.3.48_api.zip
@ AssemblyLine_v0.2.3.49.jar AssemblyLine_v0.2.3.49_api.zip
@ AssemblyLine_v0.2.3.50.jar AssemblyLine_v0.2.3.50_api.zip
@ AssemblyLine_v0.2.3.51.jar AssemblyLine_v0.2.3.51_api.zip
@ AssemblyLine_v0.2.3.52.jar AssemblyLine_v0.2.3.52_api.zip
@ AssemblyLine_v0.2.3.53.jar AssemblyLine_v0.2.3.53_api.zip
@ AssemblyLine_v0.2.3.54.jar AssemblyLine_v0.2.3.54_api.zip
@ AssemblyLine_v0.2.3.55.jar AssemblyLine_v0.2.3.55_api.zip
@ AssemblyLine_v0.2.3.56.jar AssemblyLine_v0.2.3.56_api.zip
* AssemblyLine_v0.2.3.57.jar AssemblyLine_v0.2.3.57_api.zip
x AssemblyLine_v0.2.3.58.jar AssemblyLine_v0.2.3.58_api.zip
@ AssemblyLine_v0.2.4.59.jar AssemblyLine_v0.2.4.59_api.zip
x AssemblyLine_v0.2.4.60.jar AssemblyLine_v0.2.4.60_api.zip
@ AssemblyLine_v0.2.4.61.jar AssemblyLine_v0.2.4.61_api.zip
@ AssemblyLine_v0.2.4.62.jar AssemblyLine_v0.2.4.62_api.zip
@ AssemblyLine_v0.2.4.63.jar AssemblyLine_v0.2.4.63_api.zip
x AssemblyLine_v0.2.4.64.jar AssemblyLine_v0.2.4.64_api.zip
@ AssemblyLine_v0.2.4.65.jar AssemblyLine_v0.2.4.65_api.zip
@ AssemblyLine_v0.2.4.66.jar AssemblyLine_v0.2.4.66_api.zip
* AssemblyLine_v0.2.4.67.jar AssemblyLine_v0.2.4.67_api.zip
* AssemblyLine_v0.2.4.68.jar AssemblyLine_v0.2.4.68_api.zip
@ AssemblyLine_v0.0.6.1.jar
@ AssemblyLine_v0.0.6.2.jar
@ AssemblyLine_v0.0.6.3.jar
* AssemblyLine_v0.0.6.5.jar
@ AssemblyLine_v0.0.6.6.jar
@ AssemblyLine_v0.0.6.7.jar
@ AssemblyLine_v0.0.6.8.jar AssemblyLine_v0.0.6.8_api.zip
@ AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip
Minecraft 1.3.2
* AssemblyLine_v0.1.2.10.jar AssemblyLine_v0.1.2.10_api.zip
Minecraft 1.4.2
@ AssemblyLine_v0.1.3.11.jar AssemblyLine_v0.1.3.11_api.zip
* AssemblyLine_v0.1.3.13.jar AssemblyLine_v0.1.3.13_api.zip
* AssemblyLine_v0.1.4.14.jar AssemblyLine_v0.1.4.14_api.zip
* AssemblyLine_v0.1.5.18.jar AssemblyLine_v0.1.5.18_api.zip
@ AssemblyLine_v0.1.6.19.jar AssemblyLine_v0.1.6.19_api.zip
@ AssemblyLine_v0.1.6.20.jar AssemblyLine_v0.1.6.20_api.zip
@ AssemblyLine_v0.1.6.21.jar AssemblyLine_v0.1.6.21_api.zip
x AssemblyLine_v0.1.6.22.jar AssemblyLine_v0.1.6.22_api.zip
x AssemblyLine_v0.1.6.23.jar AssemblyLine_v0.1.6.23_api.zip
* AssemblyLine_v0.1.6.24.jar AssemblyLine_v0.1.6.24_api.zip
@ AssemblyLine_v0.1.7.25.jar AssemblyLine_v0.1.7.25_api.zip
* AssemblyLine_v0.1.7.26.jar AssemblyLine_v0.1.7.26_api.zip
* AssemblyLine_v0.1.7.27.jar AssemblyLine_v0.1.7.27_api.zip
Minecraft 1.4.5
@ AssemblyLine_v0.1.8.28.jar AssemblyLine_v0.1.8.28_api.zip
@ AssemblyLine_v0.1.8.29.jar AssemblyLine_v0.1.8.29_api.zip
* AssemblyLine_v0.1.8.30.jar AssemblyLine_v0.1.8.30_api.zip
@ AssemblyLine_v0.1.8.31.jar AssemblyLine_v0.1.8.31_api.zip
@ AssemblyLine_v0.1.9.32.jar AssemblyLine_v0.1.9.32_api.zip
@ AssemblyLine_v0.1.9.33.jar AssemblyLine_v0.1.9.33_api.zip
@ AssemblyLine_v0.1.9.34.jar AssemblyLine_v0.1.9.34_api.zip
* AssemblyLine_v0.1.9.35.jar AssemblyLine_v0.1.9.35_api.zip
@ AssemblyLine_v0.1.9.36.jar AssemblyLine_v0.1.9.36_api.zip
@ AssemblyLine_v0.2.0.38.jar AssemblyLine_v0.2.0.38_api.zip* AssemblyLine_v0.2.0.38.jar AssemblyLine_v0.2.0.38_api.zip
@ AssemblyLine_v0.2.1.39.jar AssemblyLine_v0.2.1.39_api.zip
* AssemblyLine_v0.2.1.40.jar AssemblyLine_v0.2.1.40_api.zip
@ AssemblyLine_v0.2.2.41.jar AssemblyLine_v0.2.2.41_api.zip
@ AssemblyLine_v0.2.2.42.jar AssemblyLine_v0.2.2.42_api.zip
@ AssemblyLine_v0.2.2.43.jar AssemblyLine_v0.2.2.43_api.zip
* AssemblyLine_v0.2.2.44.jar AssemblyLine_v0.2.2.44_api.zip
@ AssemblyLine_v0.2.3.47.jar AssemblyLine_v0.2.3.47_api.zip
@ AssemblyLine_v0.2.3.48.jar AssemblyLine_v0.2.3.48_api.zip
@ AssemblyLine_v0.2.3.49.jar AssemblyLine_v0.2.3.49_api.zip
@ AssemblyLine_v0.2.3.50.jar AssemblyLine_v0.2.3.50_api.zip
@ AssemblyLine_v0.2.3.51.jar AssemblyLine_v0.2.3.51_api.zip
@ AssemblyLine_v0.2.3.52.jar AssemblyLine_v0.2.3.52_api.zip
@ AssemblyLine_v0.2.3.53.jar AssemblyLine_v0.2.3.53_api.zip
@ AssemblyLine_v0.2.3.54.jar AssemblyLine_v0.2.3.54_api.zip
@ AssemblyLine_v0.2.3.55.jar AssemblyLine_v0.2.3.55_api.zip
@ AssemblyLine_v0.2.3.56.jar AssemblyLine_v0.2.3.56_api.zip
* AssemblyLine_v0.2.3.57.jar AssemblyLine_v0.2.3.57_api.zip
x AssemblyLine_v0.2.3.58.jar AssemblyLine_v0.2.3.58_api.zip
@ AssemblyLine_v0.2.4.59.jar AssemblyLine_v0.2.4.59_api.zip
x AssemblyLine_v0.2.4.60.jar AssemblyLine_v0.2.4.60_api.zip
@ AssemblyLine_v0.2.4.61.jar AssemblyLine_v0.2.4.61_api.zip
@ AssemblyLine_v0.2.4.62.jar AssemblyLine_v0.2.4.62_api.zip
@ AssemblyLine_v0.2.4.63.jar AssemblyLine_v0.2.4.63_api.zip
x AssemblyLine_v0.2.4.64.jar AssemblyLine_v0.2.4.64_api.zip
@ AssemblyLine_v0.2.4.65.jar AssemblyLine_v0.2.4.65_api.zip
@ AssemblyLine_v0.2.4.66.jar AssemblyLine_v0.2.4.66_api.zip
@ AssemblyLine_v0.2.4.67.jar AssemblyLine_v0.2.4.67_api.zip
* AssemblyLine_v0.2.4.68.jar AssemblyLine_v0.2.4.68_api.zip

2
modversion.txt
View file

@ -1 +1 @@
0.2.4
0.2.5

5
resources/mcmod.info
View file

@ -2,12 +2,13 @@
{
"modid" : "AssemblyLine",
"name" : "Assembly Line",
"version" : "0.2.3",
"version" : "0.2.5",
"url" : "http://calclavia.com/universalelectricity/?m=18",
"credits" : "",
"authors": [
"Calclavia",
"Darkguardsman"
"Darkguardsman",
"Briman"
],
"description": "A mod that brings conveyor belt transporting systems to Minecraft.",
"logoFile" : "/al_logo.png",

1
src/minecraft/assemblyline/client/model/ModelCraneController.java
View file

@ -8,7 +8,6 @@ package assemblyline.client.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.common.ForgeDirection;
public class ModelCraneController extends ModelBase
{

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

@ -1,6 +1,11 @@
package assemblyline.client.render;
import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL11.GL_LIGHTING;
import static org.lwjgl.opengl.GL11.glEnable;
import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;
import static org.lwjgl.opengl.GL11.glRotatef;
import static org.lwjgl.opengl.GL11.glTranslated;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import assemblyline.client.model.ModelCraneController;

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

@ -48,51 +48,51 @@ import cpw.mods.fml.relauncher.Side;
public class AssemblyLine
{
@SidedProxy(clientSide = "assemblyline.client.ClientProxy", serverSide = "assemblyline.common.CommonProxy")
public static CommonProxy proxy;
public static CommonProxy proxy;
@Instance(AssemblyLine.CHANNEL)
public static AssemblyLine instance;
public static AssemblyLine instance;
public static final String NAME = "Assembly Line";
public static final String NAME = "Assembly Line";
public static final String VERSION = "0.2.4";
public static final String VERSION = "0.2.5";
public static final String CHANNEL = "AssemblyLine";
public static final String CHANNEL = "AssemblyLine";
public static final String DIRECTORY_NO_SLASH = "assemblyline/";
public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
public static final String TEXTURE_PATH = DIRECTORY + "textures/";
public static final String LANGUAGE_PATH = DIRECTORY + "language/";
public static final String BLOCK_TEXTURE_PATH = TEXTURE_PATH + "blocks.png";
public static final String ITEM_TEXTURE_PATH = TEXTURE_PATH + "items.png";
public static final String DIRECTORY_NO_SLASH = "assemblyline/";
public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
public static final String TEXTURE_PATH = DIRECTORY + "textures/";
public static final String LANGUAGE_PATH = DIRECTORY + "language/";
public static final String BLOCK_TEXTURE_PATH = TEXTURE_PATH + "blocks.png";
public static final String ITEM_TEXTURE_PATH = TEXTURE_PATH + "items.png";
private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" };
private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" };
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "UniversalElectricity/AssemblyLine.cfg"));
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "UniversalElectricity/AssemblyLine.cfg"));
public static final int BLOCK_ID_PREFIX = 3030;
public static final int BLOCK_ID_PREFIX = 3030;
public static Block blockConveyorBelt;
public static Block blockManipulator;
public static Block blockCrate;
public static Block blockImprinter;
public static Block blockEncoder;
public static Block blockDetector;
public static Block blockRejector;
public static Block blockArmbot;
public static Block blockCraneController;
public static Block blockCraneParts;
public static Block blockConveyorBelt;
public static Block blockManipulator;
public static Block blockCrate;
public static Block blockImprinter;
public static Block blockEncoder;
public static Block blockDetector;
public static Block blockRejector;
public static Block blockArmbot;
public static Block blockCraneController;
public static Block blockCraneParts;
public static BlockMulti blockMulti;
public static BlockMulti blockMulti;
public static final int ITEM_ID_PREFIX = 13030;
public static Item itemImprint;
public static Item itemDisk;
public static final int ITEM_ID_PREFIX = 13030;
public static Item itemImprint;
public static Item itemDisk;
@PreInit
public void preInit(FMLPreInitializationEvent event)
{
UniversalElectricity.register(this, 1, 2, 1, false);
UniversalElectricity.register(this, 1, 2, 4, false);
instance = this;
CONFIGURATION.load();
@ -106,11 +106,10 @@ public class AssemblyLine
blockArmbot = new BlockArmbot(CONFIGURATION.getBlock("Armbot", BLOCK_ID_PREFIX + 8).getInt());
blockMulti = new BlockMulti(CONFIGURATION.getBlock("Multiblock", BLOCK_ID_PREFIX + 9).getInt());
blockCraneController = new BlockCraneController(CONFIGURATION.getBlock("CraneController", BLOCK_ID_PREFIX + 10).getInt());
blockCraneController = new BlockCraneParts(CONFIGURATION.getBlock("CraneParts", BLOCK_ID_PREFIX + 11).getInt());
blockCraneParts = new BlockCraneParts(CONFIGURATION.getBlock("CraneParts", BLOCK_ID_PREFIX + 11).getInt());
itemImprint = new ItemImprinter(CONFIGURATION.getBlock("Imprint", ITEM_ID_PREFIX).getInt());
itemDisk = new ItemDisk(CONFIGURATION.getBlock("Disk", ITEM_ID_PREFIX + 1).getInt());
itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", ITEM_ID_PREFIX).getInt());
itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", ITEM_ID_PREFIX + 1).getInt());
CONFIGURATION.save();
NetworkRegistry.instance().registerGuiHandler(this, this.proxy);
@ -123,7 +122,7 @@ public class AssemblyLine
GameRegistry.registerBlock(blockRejector, "Rejector");
GameRegistry.registerBlock(blockArmbot, "Armbot");
GameRegistry.registerBlock(blockCraneController, "Crane Controller");
GameRegistry.registerBlock(blockCraneParts,ItemCraneParts.class, "Crane Parts");
GameRegistry.registerBlock(blockCraneParts, ItemCraneParts.class, "Crane Parts");
TabAssemblyLine.itemStack = new ItemStack(AssemblyLine.blockConveyorBelt);
UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt");
@ -172,8 +171,8 @@ public class AssemblyLine
@ServerStarted
public void serverStarted(FMLServerStartedEvent evt)
{
//LOLOLOL i wish
//MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().remove("briman0094");
// LOLOLOL i wish
// MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().remove("briman0094");
}
public static void printSidedData(String data)

3
src/minecraft/assemblyline/common/machine/command/Command.java
View file

@ -33,6 +33,7 @@ public abstract class Command
registerCommand("repeat", CommandRepeat.class);
registerCommand("use", CommandUse.class);
registerCommand("fire", CommandFire.class);
registerCommand("break", CommandBreak.class);
}
public static void registerCommand(String command, Class<? extends Command> commandClass)
@ -174,7 +175,7 @@ public abstract class Command
{
taskCompound.setInteger("ticks", this.ticks);
}
@Override
public String toString()
{

47
src/minecraft/assemblyline/common/machine/command/CommandBreak.java Normal file
View file

@ -0,0 +1,47 @@
package assemblyline.common.machine.command;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import universalelectricity.core.vector.Vector3;
/**
* Used by arms to break a specific block in a position.
*
* @author Calclavia
*/
public class CommandBreak extends Command
{
public static final float radius = 0.5f;
public CommandBreak()
{
super();
}
@Override
protected boolean doTask()
{
super.doTask();
if (this.tileEntity.grabbedEntities.size() > 0)
return false;
Vector3 serachPosition = this.tileEntity.getHandPosition();
Block block = Block.blocksList[serachPosition.getBlockID(this.world)];
if (block != null)
{
block.dropBlockAsItem(this.world, serachPosition.intX(), serachPosition.intY(), serachPosition.intZ(), serachPosition.getBlockMetadata(this.world), 0);
serachPosition.setBlockWithNotify(this.world, 0);
}
return true;
}
@Override
public String toString()
{
return "BREAK";
}
}

13
src/minecraft/assemblyline/common/machine/command/CommandGrab.java
View file

@ -17,12 +17,12 @@ import universalelectricity.core.vector.Vector3;
public class CommandGrab extends Command
{
public static final float radius = 0.5f;
public static final float radius = 0.5f;
/**
* The item to be collected.
*/
private Class<? extends Entity> entityToInclude;
private Class<? extends Entity> entityToInclude;
public CommandGrab()
{
@ -45,11 +45,16 @@ public class CommandGrab extends Command
{
for (int i = 0; i < found.size(); i++)
{
if (found.get(i) != null && !(found.get(i) instanceof EntityPlayer) && !(found.get(i) instanceof EntityArrow) && found.get(i).ridingEntity == null) // isn't null, isn't a player, and isn't riding anything
if (found.get(i) != null && !(found.get(i) instanceof EntityPlayer) && !(found.get(i) instanceof EntityArrow) && found.get(i).ridingEntity == null)
{
this.tileEntity.grabbedEntities.add(found.get(i));
if (found.get(i) instanceof EntityItem)
this.tileEntity.worldObj.removeEntity(found.get(i)); // items don't move right, so we render them manually
{
// items don't move right, so we render them manually
this.tileEntity.worldObj.removeEntity(found.get(i));
}
this.world.playSound(this.tileEntity.xCoord, this.tileEntity.yCoord, this.tileEntity.zCoord, "random.pop", 0.2F, ((this.tileEntity.worldObj.rand.nextFloat() - this.tileEntity.worldObj.rand.nextFloat()) * 0.7F + 1.0F) * 1.0F, true);
found.get(i).isDead = false;
return false;

1
src/minecraft/assemblyline/common/machine/crane/BlockCraneController.java
View file

@ -1,6 +1,5 @@
package assemblyline.common.machine.crane;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;

6
src/minecraft/assemblyline/common/machine/crane/BlockCraneParts.java
View file

@ -1,10 +1,8 @@
package assemblyline.common.machine.crane;
import assemblyline.common.TabAssemblyLine;
import universalelectricity.prefab.BlockMachine;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import universalelectricity.prefab.BlockMachine;
import assemblyline.common.TabAssemblyLine;
public class BlockCraneParts extends BlockMachine
{