diff options
Diffstat (limited to 'src')
3 files changed, 20 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 6c22169f50..5577de49e8 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -92,7 +92,7 @@ public class ItemGiantEgg extends BaseItemBurnable { if (NBTUtils.getInteger(aStack, "mAge") >= NBTUtils.getInteger(aStack, "mEggAge")) { if (MathUtils.randInt(0, 1000) >= 990) { if (NBTUtils.hasKey(aStack, "size")) { - if (NBTUtils.getInteger(aStack, "size") >= MathUtils.randInt(0, 9)) { + if ((NBTUtils.getInteger(aStack, "size")+1) >= MathUtils.randInt(0, 9)) { ((EntityPlayer) entityHolding).inventory.addItemStackToInventory((mCorrectEgg)); ((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this); } @@ -121,7 +121,7 @@ public class ItemGiantEgg extends BaseItemBurnable { NBTUtils.setInteger(aStack, "size", MathUtils.randInt(1, 8)); } if (player && !NBTUtils.hasKey(aStack, "mEggAge") && NBTUtils.hasKey(aStack, "size")) { - NBTUtils.setInteger(aStack, "mEggAge", (MathUtils.randInt(8000, 16000)*NBTUtils.getInteger(aStack, "size"))); + NBTUtils.setInteger(aStack, "mEggAge", ((MathUtils.randInt(8000, 16000)*NBTUtils.getInteger(aStack, "size"))/2)); } } } @@ -182,7 +182,8 @@ public class ItemGiantEgg extends BaseItemBurnable { } list.add("Egg Size: "+size+" ounces"); list.add("Age: "+(age/20)+"s"+" / "+(life/20)+"s"); - list.add("Larger eggs take longer to hatch, but have a better chance of hatching."); + list.add("Larger eggs take longer to hatch,"); + list.add("but have a better chance of hatching."); super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index a2e40ca4c9..01305eec4e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -52,6 +52,14 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta } public String[] getDescription() { + + if (mCasingName.toLowerCase().contains(".name")) { + mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 10); + } + if (mCryoFuelName.toLowerCase().contains(".")) { + mCryoFuelName = FluidUtils.getFluidStack("cryotheum", 1).getLocalizedName(); + } + return new String[]{ "Controller Block for the Advanced Cryogenic Freezer", "Super cools hot ingots and cells", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 15c4d487be..9d2928fa0e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -64,6 +64,14 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase } public String[] getDescription() { + + if (mCasingName.toLowerCase().contains(".name")) { + mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 11); + } + if (mHotFuelName.toLowerCase().contains(".")) { + mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); + } + return new String[]{ "Controller Block for the Advanced Electric Blast Furnace", "Consumes 1L of "+mHotFuelName+"/t during operation", |