maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/techreborn/tiles/TileAlloySmelter.java
View file

@ -1,5 +1,9 @@
package techreborn.tiles;
import java.util.List;
import javax.rmi.CORBA.Tie;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -28,7 +32,7 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
inputs[1] = 1;
int[] outputs = new int[1];
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
@ -111,5 +115,15 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
{
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");
}
}
}

12
src/main/java/techreborn/tiles/TileAssemblingMachine.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -111,5 +113,15 @@ public class TileAssemblingMachine extends TileMachineBase implements IWrenchabl
{
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");
}
}
}

12
src/main/java/techreborn/tiles/TileChemicalReactor.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -111,5 +113,15 @@ public class TileChemicalReactor extends TileMachineBase implements IWrenchable,
{
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");
}
}
}

15
src/main/java/techreborn/tiles/TileHeatGenerator.java
View file

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

12
src/main/java/techreborn/tiles/TileImplosionCompressor.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.tile.IEnergyTile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -94,5 +96,15 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha
energy.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");
}
}
}

12
src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -109,6 +111,16 @@ public class TileIndustrialElectrolyzer extends TileMachineBase implements IWren
{
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");
}
}
}

12
src/main/java/techreborn/tiles/TileIndustrialSawmill.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -113,5 +115,15 @@ public class TileIndustrialSawmill extends TileMachineBase implements IWrenchabl
{
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");
}
}
}

12
src/main/java/techreborn/tiles/TileLathe.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -110,5 +112,15 @@ public class TileLathe extends TileMachineBase implements IWrenchable, IEnergyTi
{
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");
}
}
}

12
src/main/java/techreborn/tiles/TilePlateCuttingMachine.java
View file

@ -1,5 +1,7 @@
package techreborn.tiles;
import java.util.List;
import ic2.api.energy.prefab.BasicSink;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.tile.IWrenchable;
@ -99,6 +101,16 @@ public class TilePlateCuttingMachine extends TileMachineBase implements IWrencha
energy.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");
}
}
}