diff options
| author | Blood-Asp <Blood@Asp> | 2015-06-29 23:03:55 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-06-29 23:03:55 +0200 |
| commit | 002e757d65f20ab809f7a21d0662e36aa84c2fc0 (patch) | |
| tree | f9af947c08343be8d475ef7aebc3dae7e12050bc /main/java/gregtech/api/items | |
| parent | 8198a51aeef641fd25d2b77f776c7640dd3f84a9 (diff) | |
| download | GT5-Unofficial-002e757d65f20ab809f7a21d0662e36aa84c2fc0.tar.gz GT5-Unofficial-002e757d65f20ab809f7a21d0662e36aa84c2fc0.tar.bz2 GT5-Unofficial-002e757d65f20ab809f7a21d0662e36aa84c2fc0.zip | |
Version 5.08.22-23
Diffstat (limited to 'main/java/gregtech/api/items')
| -rw-r--r-- | main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 1 | ||||
| -rw-r--r-- | main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index b574d90f63..292e2d4628 100644 --- a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -339,6 +339,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements if (tStats == null || GT_Utility.setStack(aStack, tStats.getBrokenItem(aStack)) == null) { if (tStats != null) GT_Utility.doSoundAtClient(tStats.getBreakingSound(), 1, 1.0F); if (aStack.stackSize > 0) aStack.stackSize--; + } } return true; diff --git a/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java index e556f4b53c..2d9d8e0c4f 100644 --- a/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java +++ b/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java @@ -21,10 +21,11 @@ import net.minecraft.world.World; public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implements IReactorComponent { public final int numberOfCells; - public final double sEnergy; + public final float sEnergy; public final int sRadiation; + public final float sHeat; - public GT_RadioactiveCellIC_Item( String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, double aEnergy, int aRadiation) + public GT_RadioactiveCellIC_Item( String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, float aEnergy, int aRadiation, float aHeat) { super(aUnlocalized, aEnglish, aCellcount); setMaxStackSize(64); @@ -32,6 +33,7 @@ import net.minecraft.world.World; this.numberOfCells = aCellcount; this.sEnergy = aEnergy; this.sRadiation = aRadiation; + this.sHeat = aHeat; } @@ -76,7 +78,7 @@ import net.minecraft.world.World; checkHeatAcceptor(reactor, x + 1, y, heatAcceptors); checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); checkHeatAcceptor(reactor, x, y + 1, heatAcceptors); - heat = (int) (heat * sEnergy); + heat = Math.round(heat * sHeat); while ((heatAcceptors.size() > 0) && (heat > 0)) { |