diff options
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gregtech/api/util/Recipe_GT.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index e51d3a00cb..5fef97832a 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -255,7 +255,7 @@ public class Recipe_GT extends GT_Recipe{ //RTG FUel Map public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new Recipe_GT.GT_Recipe_Map_Fuel( new HashSet(10), "gt.recipe.RTGgenerators", "RTG", null, - "gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); + "gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 365, " Minecraft Days", true, true); /** diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index c9d0230514..a372ea217c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -17,6 +17,7 @@ import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -188,8 +189,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { null, null, 0, - 0, - GregtechMetaTileEntity_RTG_Generator.convertDaysToTicks(87.7f)); + 64, + MathUtils.roundToClosestInt(87.7f)); Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_SR90.get(1)}, @@ -198,8 +199,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { null, null, 0, - 0, - GregtechMetaTileEntity_RTG_Generator.convertDaysToTicks(28.8f)); + 32, + MathUtils.roundToClosestInt(28.8f)); Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_PO210.get(1)}, @@ -208,8 +209,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { null, null, 0, - 0, - GregtechMetaTileEntity_RTG_Generator.convertDaysToTicks(0.4f)); + 512, + MathUtils.roundToClosestInt(0.4f)); Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_AM241.get(1)}, @@ -218,8 +219,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { null, null, 0, - 0, - GregtechMetaTileEntity_RTG_Generator.convertDaysToTicks(432)); + 16, + MathUtils.roundToClosestInt(432)); //Computer Cube GregtechItemList.Gregtech_Computer_Cube.set(this.addItem(tLastID = 55, "Gregtech Computer Cube", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 8L), getTcAspectStack(TC_Aspects.POTENTIA, 8L)})); this.setElectricStats(32000 + tLastID, Integer.MAX_VALUE, GT_Values.V[5], 5L, -3L, true); |