Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tntrololol 2015-05-16 18:52:15 -05:00
commit 3b5f80bf77
9 changed files with 112 additions and 3 deletions

View file

@ -1,5 +1,9 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import javax.rmi.CORBA.Tie;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -28,7 +32,7 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
inputs[1] = 1; inputs[1] = 1;
int[] outputs = new int[1]; int[] outputs = new int[1];
outputs[0] = 2; outputs[0] = 2;
crafter = new RecipeCrafter("alloySmelterRecipe", this, energy, 2, 2, inventory, inputs, outputs); crafter = new RecipeCrafter("alloySmelterRecipe", this, energy, 2, 1, inventory, inputs, outputs);
} }
@Override @Override
@ -112,4 +116,14 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
energy.onChunkUnload(); energy.onChunkUnload();
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -112,4 +114,14 @@ public class TileAssemblingMachine extends TileMachineBase implements IWrenchabl
energy.onChunkUnload(); energy.onChunkUnload();
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -112,4 +114,14 @@ public class TileChemicalReactor extends TileMachineBase implements IWrenchable,
energy.onChunkUnload(); energy.onChunkUnload();
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.prefab.BasicSource; import ic2.api.energy.prefab.BasicSource;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
@ -18,11 +20,11 @@ import techreborn.util.Inventory;
public class TileHeatGenerator extends TileMachineBase implements IWrenchable, IEnergyTile { public class TileHeatGenerator extends TileMachineBase implements IWrenchable, IEnergyTile {
public BasicSource energy; public BasicSource energy;
public static final int euTick = 1; public static final int euTick = ConfigTechReborn.heatGeneratorOutput;
public TileHeatGenerator() public TileHeatGenerator()
{ {
energy = new BasicSource(this, 1000, ConfigTechReborn.heatGeneratorOutput); energy = new BasicSource(this, 1000, euTick);
} }
@Override @Override
@ -53,6 +55,7 @@ public class TileHeatGenerator extends TileMachineBase implements IWrenchable, I
{ {
energy.addEnergy(euTick); energy.addEnergy(euTick);
} }
} }
} }
@ -125,4 +128,12 @@ public class TileHeatGenerator extends TileMachineBase implements IWrenchable, I
energy.writeToNBT(tagCompound); energy.writeToNBT(tagCompound);
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Generarating " + euTick +" EU/t");
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -95,4 +97,14 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha
crafter.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound);
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -110,5 +112,15 @@ public class TileIndustrialElectrolyzer extends TileMachineBase implements IWren
energy.onChunkUnload(); energy.onChunkUnload();
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -114,4 +116,14 @@ public class TileIndustrialSawmill extends TileMachineBase implements IWrenchabl
energy.onChunkUnload(); energy.onChunkUnload();
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -111,4 +113,14 @@ public class TileLathe extends TileMachineBase implements IWrenchable, IEnergyTi
energy.onChunkUnload(); energy.onChunkUnload();
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }

View file

@ -1,5 +1,7 @@
package techreborn.tiles; package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile; import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable; import ic2.api.tile.IWrenchable;
@ -100,5 +102,15 @@ public class TilePlateCuttingMachine extends TileMachineBase implements IWrencha
crafter.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound);
} }
@Override
public void addWailaInfo(List<String> info)
{
super.addWailaInfo(info);
info.add("Power Stored " + energy.getEnergyStored() +" EU");
if(crafter.currentRecipe !=null){
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
}
}
} }