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

Update to 1.5.1

Browse source 
Still need to fix textures
This commit is contained in:
Brian Ricketts 2013-03-22 23:54:10 -05:00
parent c5d47c43cc
commit f222ce9b7f
28 changed files with 70 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/assemblyline/common/block/BlockALMachine.java
View file

@ -22,9 +22,9 @@ public class BlockALMachine extends BlockAdvanced
@SideOnly(Side.CLIENT)
@Override
public void func_94332_a(IconRegister iconReg)
public void registerIcons(IconRegister iconReg)
{
this.machine_icon = iconReg.func_94245_a("machine");
this.machine_icon = iconReg.registerIcon("machine");
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)

7
src/minecraft/assemblyline/common/block/BlockCrate.java
View file

@ -38,9 +38,9 @@ public class BlockCrate extends BlockALMachine
@SideOnly(Side.CLIENT)
@Override
public void func_94332_a(IconRegister iconReg)
public void registerIcons(IconRegister iconReg)
{
this.crate_icon = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"crate");
this.crate_icon = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"crate");
}
@Override
@ -387,8 +387,7 @@ public class BlockCrate extends BlockALMachine
var13.delayBeforeCanPickup = 10;
world.spawnEntityInWorld(var13);
tileEntity.setInventorySlotContents(0, null);
world.setBlockAndMetadataWithNotify(x, y, z, 0, 0, 3);
world.setBlock(x, y, z, 0, 0, 3);
return true;
}
}

4
src/minecraft/assemblyline/common/block/TileEntityCrate.java
View file

@ -280,14 +280,14 @@ public class TileEntityCrate extends TileEntityAdvanced implements ITier, IInven
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
// TODO Auto-generated method stub
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
// TODO Auto-generated method stub
return false;

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

@ -220,13 +220,13 @@ public class TileEntityRoboticSorter extends TileEntityElectricityRunnable imple
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
return false;
}

18
src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java
View file

@ -170,7 +170,8 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult
}
}
// System.out.println("Ren: " + this.renderYaw + "; Rot: " + this.rotationYaw);
// System.out.println("Ren: " + this.renderYaw + "; Rot: " +
// this.rotationYaw);
if (Math.abs(this.renderYaw - this.rotationYaw) > 0.001f)
{
float speedYaw;
@ -664,8 +665,8 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult
@Override
public void onDestroy(TileEntity callingBlock)
{
this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, 0, 0, 3);
this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord + 1, this.zCoord, 0, 0, 3);
this.worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, 0, 0, 3);
this.worldObj.setBlock(this.xCoord, this.yCoord + 1, this.zCoord, 0, 0, 3);
}
@Override
@ -753,12 +754,14 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult
}
case 5:
{
// isWorking: returns whether or not the ArmBot is executing commands
// isWorking: returns whether or not the ArmBot is executing
// commands
return new Object[] { this.commandManager.hasTasks() };
}
case 6:
{
// touchingEntity: returns whether or not the ArmBot is touching an entity it is
// touchingEntity: returns whether or not the ArmBot is touching an
// entity it is
// able to pick up
Vector3 serachPosition = this.getHandPosition();
List<Entity> found = this.worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(serachPosition.x - 0.5f, serachPosition.y - 0.5f, serachPosition.z - 0.5f, serachPosition.x + 0.5f, serachPosition.y + 0.5f, serachPosition.z + 0.5f));
@ -969,14 +972,13 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
// TODO Auto-generated method stub
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
return false;
}

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

@ -42,7 +42,7 @@ public class CommandBreak extends Command
this.tileEntity.grabEntity(new EntityItem(this.world, (double) serachPosition.intX() + 0.5D, (double) serachPosition.intY() + 0.5D, (double) serachPosition.intZ() + 0.5D, items.get(0)));
}
world.setBlockAndMetadataWithNotify(serachPosition.intX(),serachPosition.intY(),serachPosition.intZ(), 0, 0, 3);
world.setBlock(serachPosition.intX(),serachPosition.intY(),serachPosition.intZ(), 0, 0, 3);
return false;
}

2
src/minecraft/assemblyline/common/machine/command/CommandPlace.java
View file

@ -62,7 +62,7 @@ public class CommandPlace extends Command
int blockID = plantable.getPlantID(this.world, serachPosition.intX(), serachPosition.intY(), serachPosition.intZ());
int blockMetadata = plantable.getPlantMetadata(this.world, serachPosition.intX(), serachPosition.intY(), serachPosition.intZ());
if (this.world.setBlockAndMetadataWithNotify(serachPosition.intX(), serachPosition.intY(), serachPosition.intZ(), blockID, blockMetadata, 3))
if (this.world.setBlock(serachPosition.intX(), serachPosition.intY(), serachPosition.intZ(), blockID, blockMetadata, 3))
{
if (this.world.getBlockId(serachPosition.intX(), serachPosition.intY(), serachPosition.intZ()) == blockID)
{

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

@ -66,11 +66,11 @@ public class BlockDetector extends BlockImprintable
@SideOnly(Side.CLIENT)
@Override
public void func_94332_a(IconRegister iconReg)
public void registerIcons(IconRegister iconReg)
{
super.func_94332_a(iconReg);
this.eye_green = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX + "detector_green");
this.eye_red = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX + "detector_red");
super.registerIcons(iconReg);
this.eye_green = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "detector_green");
this.eye_red = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "detector_red");
}
@Override
@ -120,7 +120,7 @@ public class BlockDetector extends BlockImprintable
if (!canBlockStay(world, x, y, z))
{
this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
world.setBlockAndMetadataWithNotify(x, y, z, 0, 0, 3);
world.setBlock(x, y, z, 0, 0, 3);
}
}

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

@ -27,11 +27,11 @@ public class BlockEncoder extends BlockALMachine
@SideOnly(Side.CLIENT)
@Override
public void func_94332_a(IconRegister iconReg)
public void registerIcons(IconRegister iconReg)
{
this.encoder_side = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_side");
this.encoder_top = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_top");
this.encoder_bottom = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_bottom");
this.encoder_side = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_side");
this.encoder_top = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_top");
this.encoder_bottom = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_bottom");
}
/**
* Returns the block texture based on the side being looked at. Args: side

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

@ -202,14 +202,14 @@ public class TileEntityEncoder extends TileEntityAdvanced implements IPacketRece
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
//TODO ?
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
// TODO Auto-generated method stub
return false;

8
src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java
View file

@ -33,11 +33,11 @@ public class BlockImprinter extends BlockALMachine
@SideOnly(Side.CLIENT)
@Override
public void func_94332_a(IconRegister iconReg)
public void registerIcons(IconRegister iconReg)
{
this.imprinter_side = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"imprinter_side");
this.imprinter_top = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"imprinter_top");
this.imprinter_bottom = iconReg.func_94245_a(AssemblyLine.TEXTURE_NAME_PREFIX+"imprinter_bottom");
this.imprinter_side = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"imprinter_side");
this.imprinter_top = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"imprinter_top");
this.imprinter_bottom = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"imprinter_bottom");
}
/**

4
src/minecraft/assemblyline/common/machine/imprinter/TileEntityImprinter.java
View file

@ -857,14 +857,14 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
// TODO Auto-generated method stub
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
// TODO Auto-generated method stub
return false;

2
src/minecraft/universalelectricity/components/client/gui/GuiBatteryBox.java
View file

@ -55,7 +55,7 @@ public class GuiBatteryBox extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.renderEngine.func_98187_b(BasicComponents.GUI_DIRECTORY + "battery_box.png");
this.mc.renderEngine.bindTexture(BasicComponents.GUI_DIRECTORY + "battery_box.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.containerWidth = (this.width - this.xSize) / 2;

2
src/minecraft/universalelectricity/components/client/gui/GuiCoalGenerator.java
View file

@ -66,7 +66,7 @@ public class GuiCoalGenerator extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.renderEngine.func_98187_b(BasicComponents.GUI_DIRECTORY + "coal_generator.png");
this.mc.renderEngine.bindTexture(BasicComponents.GUI_DIRECTORY + "coal_generator.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
containerWidth = (this.width - this.xSize) / 2;

2
src/minecraft/universalelectricity/components/client/gui/GuiElectricFurnace.java
View file

@ -64,7 +64,7 @@ public class GuiElectricFurnace extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.renderEngine.func_98187_b(BasicComponents.GUI_DIRECTORY + "electric_furnace.png");
this.mc.renderEngine.bindTexture(BasicComponents.GUI_DIRECTORY + "electric_furnace.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
containerWidth = (this.width - this.xSize) / 2;

6
src/minecraft/universalelectricity/components/common/block/BlockBCOre.java
View file

@ -35,10 +35,10 @@ public class BlockBCOre extends Block
}
@Override
public void func_94332_a(IconRegister par1IconRegister)
public void registerIcons(IconRegister par1IconRegister)
{
this.iconCopper = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "oreCopper");
this.iconTin = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "oreTin");
this.iconCopper = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "oreCopper");
this.iconTin = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "oreTin");
}
@Override

18
src/minecraft/universalelectricity/components/common/block/BlockBasicMachine.java
View file

@ -46,16 +46,16 @@ public class BlockBasicMachine extends BlockAdvanced
}
@Override
public void func_94332_a(IconRegister par1IconRegister)
public void registerIcons(IconRegister par1IconRegister)
{
this.field_94336_cN = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "machine");
this.iconInput = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "machine_input");
this.iconOutput = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "machine_output");
this.blockIcon = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "machine");
this.iconInput = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "machine_input");
this.iconOutput = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "machine_output");
this.iconMachineSide = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "machine_side");
this.iconCoalGenerator = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "coalGenerator");
this.iconBatteryBox = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "batteryBox");
this.iconElectricFurnace = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + "electricFurnace");
this.iconMachineSide = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "machine_side");
this.iconCoalGenerator = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "coalGenerator");
this.iconBatteryBox = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "batteryBox");
this.iconElectricFurnace = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + "electricFurnace");
}
@Override
@ -105,7 +105,7 @@ public class BlockBasicMachine extends BlockAdvanced
if (side == 0 || side == 1)
{
return this.field_94336_cN;
return this.blockIcon;
}
if (metadata >= ELECTRIC_FURNACE_METADATA)

4
src/minecraft/universalelectricity/components/common/block/BlockCopperWire.java
View file

@ -23,9 +23,9 @@ public class BlockCopperWire extends BlockConductor
}
@Override
public void func_94332_a(IconRegister par1IconRegister)
public void registerIcons(IconRegister par1IconRegister)
{
this.field_94336_cN = par1IconRegister.func_94245_a(BasicComponents.TEXTURE_NAME_PREFIX + this.func_94330_A());
this.blockIcon = par1IconRegister.registerIcon(BasicComponents.TEXTURE_NAME_PREFIX + this.getUnlocalizedName2());
}
/**

4
src/minecraft/universalelectricity/components/common/item/ItemBasic.java
View file

@ -32,12 +32,12 @@ public class ItemBasic extends Item
{
for (ItemStack itemStack : list)
{
this.icons.add(iconRegister.func_94245_a(this.getUnlocalizedName(itemStack).replace("item.", BasicComponents.TEXTURE_NAME_PREFIX)));
this.icons.add(iconRegister.registerIcon(this.getUnlocalizedName(itemStack).replace("item.", BasicComponents.TEXTURE_NAME_PREFIX)));
}
}
else
{
this.iconIndex = iconRegister.func_94245_a(this.getUnlocalizedName().replace("item.", BasicComponents.TEXTURE_NAME_PREFIX));
this.iconIndex = iconRegister.registerIcon(this.getUnlocalizedName().replace("item.", BasicComponents.TEXTURE_NAME_PREFIX));
}
}

2
src/minecraft/universalelectricity/components/common/item/ItemBattery.java
View file

@ -19,7 +19,7 @@ public class ItemBattery extends ItemElectric
@SideOnly(Side.CLIENT)
public void func_94581_a(IconRegister iconRegister)
{
this.iconIndex = iconRegister.func_94245_a(this.getUnlocalizedName().replace("item.", BasicComponents.TEXTURE_NAME_PREFIX));
this.iconIndex = iconRegister.registerIcon(this.getUnlocalizedName().replace("item.", BasicComponents.TEXTURE_NAME_PREFIX));
}
@Override

2
src/minecraft/universalelectricity/components/common/item/ItemWrench.java
View file

@ -39,7 +39,7 @@ public class ItemWrench extends ItemBasic implements IToolConfigurator
{
int blockID = world.getBlockId(x, y, z);
if (blockID == Block.furnaceIdle.blockID || blockID == Block.furnaceBurning.blockID || blockID == Block.field_94340_cs.blockID || blockID == Block.field_96469_cy.blockID || blockID == Block.dispenser.blockID || blockID == Block.pistonBase.blockID || blockID == Block.pistonStickyBase.blockID)
if (blockID == Block.furnaceIdle.blockID || blockID == Block.furnaceBurning.blockID || blockID == Block.hopperBlock.blockID || blockID == Block.dropper.blockID || blockID == Block.dispenser.blockID || blockID == Block.pistonBase.blockID || blockID == Block.pistonStickyBase.blockID)
{
int metadata = world.getBlockMetadata(x, y, z);

4
src/minecraft/universalelectricity/components/common/tileentity/TileEntityBatteryBox.java
View file

@ -297,13 +297,13 @@ public class TileEntityBatteryBox extends TileEntityElectricityStorage implement
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
return false;
}

4
src/minecraft/universalelectricity/components/common/tileentity/TileEntityCoalGenerator.java
View file

@ -340,14 +340,14 @@ public class TileEntityCoalGenerator extends TileEntityElectrical implements IIn
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
// TODO Auto-generated method stub
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
// TODO Auto-generated method stub
return false;

2
src/minecraft/universalelectricity/components/common/tileentity/TileEntityCopperWire.java
View file

@ -40,7 +40,7 @@ public class TileEntityCopperWire extends TileEntityConductor
{
if (!this.worldObj.isRemote)
{
this.worldObj.setBlockAndMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, Block.fire.blockID, 0, 2);
this.worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, Block.fire.blockID, 0, 2);
}
}
}

4
src/minecraft/universalelectricity/components/common/tileentity/TileEntityElectricFurnace.java
View file

@ -377,14 +377,14 @@ public class TileEntityElectricFurnace extends TileEntityElectricityRunnable imp
}
@Override
public boolean func_94042_c()
public boolean isInvNameLocalized()
{
// TODO Auto-generated method stub
return false;
}
@Override
public boolean func_94041_b(int i, ItemStack itemstack)
public boolean isStackValidForSlot(int i, ItemStack itemstack)
{
// TODO Auto-generated method stub
return false;

4
src/minecraft/universalelectricity/core/vector/Vector3.java
View file

@ -131,12 +131,12 @@ public class Vector3 implements Cloneable
public boolean setBlock(World world, int id, int metadata)
{
return world.setBlockAndMetadataWithNotify(this.intX(), this.intY(), this.intZ(), id, metadata, 2);
return world.setBlock(this.intX(), this.intY(), this.intZ(), id, metadata, 2);
}
public boolean setBlock(World world, int id)
{
return world.setBlockAndMetadataWithNotify(this.intX(), this.intY(), this.intZ(), id, 0, 2);
return world.setBlock(this.intX(), this.intY(), this.intZ(), id, 0, 2);
}
/**

2
src/minecraft/universalelectricity/prefab/multiblock/BlockMulti.java
View file

@ -23,7 +23,7 @@ public class BlockMulti extends BlockContainer
public void makeFakeBlock(World worldObj, Vector3 position, Vector3 mainBlock)
{
worldObj.setBlockAndMetadataWithNotify(position.intX(), position.intY(), position.intZ(), this.blockID, 0, 2);
worldObj.setBlock(position.intX(), position.intY(), position.intZ(), this.blockID, 0, 2);
((TileEntityMulti) worldObj.getBlockTileEntity(position.intX(), position.intY(), position.intZ())).setMainBlock(mainBlock);
}

2
src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java
View file

@ -116,7 +116,7 @@ public class OreGenReplace extends OreGenBase
int block = par1World.getBlockId(var38, var41, var44);
if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && (this.replaceID == 0 || block == this.replaceID))
{
par1World.setBlockAndMetadataWithNotify(var38, var41, var44, this.oreID, this.oreMeta, 2);
par1World.setBlock(var38, var41, var44, this.oreID, this.oreMeta, 2);
}
}
}