Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Tool tip

Browse source
This commit is contained in:
Dream-Master 2016-04-01 20:02:42 +02:00
parent aeb50268c7
commit c1a96e3356
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
View file

@ -61,9 +61,9 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
// int heat = sumUp(pulses) * 4;
int heat = triangularNumber(pulses) * 4;
heat = getFinalHeat(reactor, yourStack, x, y, heat);
ArrayList<ItemStackCoord> heatAcceptors = new ArrayList();
checkHeatAcceptor(reactor, x - 1, y, heatAcceptors);
checkHeatAcceptor(reactor, x + 1, y, heatAcceptors);
@ -84,22 +84,22 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
}
}
if (getDamageOfStack(yourStack) >= getMaxDamageEx() - 1) {
reactor.setItemAt(x, y, sDepleted.copy());
reactor.setItemAt(x, y, sDepleted.copy());
} else if (heatrun) {
damageItemStack(yourStack, 1);
}
}
protected int getFinalHeat(IReactor reactor, ItemStack stack, int x, int y, int heat)
{
if (sMox&&reactor.isFluidCooled())
{
float breedereffectiveness = reactor.getHeat() / reactor.getMaxHeat();
if (breedereffectiveness > 0.5D) {
heat *= 2;
}
if (sMox&&reactor.isFluidCooled())
{
float breedereffectiveness = (float)reactor.getHeat() / (float)reactor.getMaxHeat();
if (breedereffectiveness > 0.5D) {
heat *= 2;
}
return heat;
}
return heat;
}
private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList<ItemStackCoord> heatAcceptors) {
@ -111,13 +111,13 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
}
public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) {
if (!heatrun) {
if(sMox){
float breedereffectiveness = (float)reactor.getHeat() / (float)reactor.getMaxHeat();
float ReaktorOutput = 1.5F * breedereffectiveness + 1.0F;
reactor.addOutput(ReaktorOutput * this.sEnergy);
}else{
reactor.addOutput((float) (1.0F * this.sEnergy));}
if (!heatrun) {
if(sMox){
float breedereffectiveness = (float)reactor.getHeat() / (float)reactor.getMaxHeat();
float ReaktorOutput = 1.5F * breedereffectiveness + 1.0F;
reactor.addOutput(ReaktorOutput * this.sEnergy);
}else{
reactor.addOutput((float) (1.0F * this.sEnergy));}
}
return true;
}

16
src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
View file

@ -1,6 +1,7 @@
package gregtech.api.items;
import ic2.core.util.StackUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -36,11 +37,12 @@ public class GT_RadioactiveCell_Item
}
return b;
}
protected static int triangularNumber(int x)
{
return (x * x + x) / 2;
}
{
return (x * x + x) / 2;
}
protected boolean outputPulseForStack(ItemStack aStack) {
NBTTagCompound tNBT = aStack.getTagCompound();
if (tNBT == null) {
@ -133,9 +135,9 @@ public class GT_RadioactiveCell_Item
setDamageForStack(stack, getDamageOfStack(stack) + Dmg);
}
public void addAdditionalToolTips(List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);
public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
super.addAdditionalToolTips(aList, aStack, aPlayer);
//aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs");
aList.add("Durability: " + (this.maxDmg - getDurabilityOfStack(aStack)) + "/" + this.maxDmg);
}
}
}