diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-03-18 22:43:22 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-03-18 22:43:22 +0100 |
| commit | e8f0482b16164aa89d10de07e6e846702b7994cf (patch) | |
| tree | 9bb165b0b2efe92af8e617d82ddf49a7f3ca4d84 /src/main/java/gregtech | |
| parent | e51cd6433d2a9adcc1334c795678b8e69bf3c474 (diff) | |
| download | GT5-Unofficial-e8f0482b16164aa89d10de07e6e846702b7994cf.tar.gz GT5-Unofficial-e8f0482b16164aa89d10de07e6e846702b7994cf.tar.bz2 GT5-Unofficial-e8f0482b16164aa89d10de07e6e846702b7994cf.zip | |
Dynamite impcomp and fluid mox fixes
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_RecipeAdder.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java index 2cd0c0d3b5..455cfb14a5 100644 --- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java +++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java @@ -94,7 +94,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement { if (sMox&&reactor.isFluidCooled()) { - float breedereffectiveness = reactor.getHeat() / reactor.getMaxHeat(); + float breedereffectiveness = (float)reactor.getHeat() / (float)reactor.getMaxHeat(); if (breedereffectiveness > 0.5D) { heat *= 2; } diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 40175f7d28..ebffafca47 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -267,7 +267,7 @@ public class GT_RecipeAdder if(tGunpowder<65){ GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, ItemList.Block_Powderbarrel.get(tGunpowder, new Object[0])}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0); } - if(tDynamite<65){ + if(tDynamite<17){ GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0); } GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, new ItemStack(Blocks.tnt,tTNT)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0); |