diff options
| author | Technus <daniel112092@gmail.com> | 2017-03-31 18:07:00 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-03-31 18:07:00 +0200 |
| commit | 8769d0c29c75c64a4f196af4caf8b9db2a421775 (patch) | |
| tree | a4a970a361b327ffff72db0db43f6aab96d053a4 /src | |
| parent | 7d34b02f7855c044832943be96ab2ab3785beb40 (diff) | |
| download | GT5-Unofficial-8769d0c29c75c64a4f196af4caf8b9db2a421775.tar.gz GT5-Unofficial-8769d0c29c75c64a4f196af4caf8b9db2a421775.tar.bz2 GT5-Unofficial-8769d0c29c75c64a4f196af4caf8b9db2a421775.zip | |
Fixed NPE
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 44bf4f1cac..19c409bfb9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -184,7 +184,7 @@ public class GT_MetaTileEntity_Scanner } tNBT.setString("author", "Assembling Line Recipe Generator"); NBTTagList tNBTList = new NBTTagList(); - tNBTList.appendTag(new NBTTagString("Constructionplan for "+tRecipe.mOutput.stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName())+". Needed EU/t: "+tRecipe.mEUt+" Productiontime: "+(tRecipe.mDuration/20))); + tNBTList.appendTag(new NBTTagString("Construction plan for "+tRecipe.mOutput.stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName())+". Needed EU/t: "+tRecipe.mEUt+" Production time: "+(tRecipe.mDuration/20))); for(int i=0;i<tRecipe.mInputs.length;i++){ if(tRecipe.mInputs[i]!=null){ tNBTList.appendTag(new NBTTagString("Input Bus "+(i+1)+": "+tRecipe.mInputs[i].stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mInputs[i].getDisplayName()))); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 4141952094..0f5e62b754 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1912,7 +1912,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Osmium, 4L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 8L)}, new FluidStack[]{ Materials.Water.getFluid(10000), - Materials.Mercury.getMolten(576), + Materials.Mercury.getFluid(576), Materials.SolderingAlloy.getMolten(1296), Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Piston_UV.get(1), 1800, 500000); |