Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3 from atrain99/master

Browse source 
I just cleaned up a few things. No biggie.
This commit is contained in:
DarkGuardsman 2012-07-23 12:57:51 -07:00
parent b511034970 eb540c69f5
commit bb6b51d255
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
minecraft/net/minecraft/src/eui/robotics/BlockComp.java
View file

@ -11,8 +11,9 @@ import net.minecraft.src.eui.boiler.TileEntityBoiler;
import net.minecraft.src.eui.burner.TileEntityFireBox;
import net.minecraft.src.eui.turbine.TileEntityGenerator;
import net.minecraft.src.universalelectricity.Vector3;
import net.minecraft.src.universalelectricity.extend.*;
public class BlockComp extends net.minecraft.src.universalelectricity.extend.BlockMachine {
public class BlockComp extends BlockMachine {
public BlockComp(int par1) {
super("RobotMachine", par1, Material.iron);

7
minecraft/net/minecraft/src/eui/robotics/EntityShoeBot.java
View file

@ -16,10 +16,11 @@ public class EntityShoeBot extends EntityRobot {
public void botUpdate()
{
super.botUpdate();
ModLoader.getMinecraftInstance().thePlayer.addChatMessage("CC");
EntityPlayer person = Modloader.getMinecraftInstance().thePlayer;
person.addChatMessage("CC");
if(hasTask)
{
ModLoader.getMinecraftInstance().thePlayer.addChatMessage("resuming task");
person.addChatMessage("resuming task");
if(this.currentTask == this.getTaskType() && this.taskLocation != null)
{
boolean harDone = harvest(this.taskLocation);
@ -50,7 +51,7 @@ public class EntityShoeBot extends EntityRobot {
public String getRenderedName() {
// TODO Auto-generated method stub
return "BlockEater";
return "Harvester Bot";
}
public String getTaskType() {
return "harvest";

4
minecraft/net/minecraft/src/mod_automation.java
View file

@ -37,9 +37,9 @@ public class mod_automation extends NetworkMod {
ModLoader.registerBlock(machine, net.minecraft.src.eui.robotics.ItemMachine.class);
//names................................................
ModLoader.addName((new ItemStack(spawnItem, 1, 0)), "Bot");
ModLoader.addName((new ItemStack(machine, 1, 0)), "Controler");
ModLoader.addName((new ItemStack(machine, 1, 0)), "Controller");
//TileEntities..................................
ModLoader.registerTileEntity(net.minecraft.src.eui.robotics.TileEntityComp.class, "controler");
ModLoader.registerTileEntity(net.minecraft.src.eui.robotics.TileEntityComp.class, "controller");
//Entities...................
ModLoader.registerEntityID(net.minecraft.src.eui.robotics.EntityShoeBot.class, "Bot", 101);//collector