diff options
Diffstat (limited to 'src/main/java/gregtech/nei')
| -rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java | 17 | ||||
| -rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 18 |
2 files changed, 27 insertions, 8 deletions
diff --git a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java index d98aa99ae7..4b05051528 100644 --- a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java @@ -278,14 +278,23 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler { specialDrew = true; } int y = 123 + (specialDrew ? 10 : 0); - if (GT_Mod.gregtechproxy.mNEIRecipeOwner && recipe.owner != null) { - drawText(10, y, EnumChatFormatting.ITALIC + GT_Utility.trans("225", "Recipe by: ") + recipe.owner.getName(), 0xFF000000); - y += 10; + if (GT_Mod.gregtechproxy.mNEIRecipeOwner) { + if (recipe.owners.size() > 1) { + drawText(10, y, EnumChatFormatting.ITALIC + GT_Utility.trans("226", "Original Recipe by: ") + recipe.owners.get(0).getName(), 0xFF000000); + y += 10; + for (int i = 1; i < recipe.owners.size(); i++) { + drawText(10, y, EnumChatFormatting.ITALIC + GT_Utility.trans("227", "Modified by: ") + recipe.owners.get(i).getName(), 0xFF000000); + y += 10; + } + } else if (recipe.owners.size() > 0) { + drawText(10, y, EnumChatFormatting.ITALIC + GT_Utility.trans("225", "Recipe by: ") + recipe.owners.get(0).getName(), 0xFF000000); + y += 10; + } } if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace && recipe.stackTraces != null) { drawText(10, y, "stackTrace:", 0xFF000000); y += 10; - for (StackTraceElement stackTrace : recipe.stackTraces) { + for (StackTraceElement stackTrace : recipe.stackTraces.get(0)) { drawText(10, y, stackTrace.toString(), 0xFF000000); y += 10; } diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index 554c724889..1d281ce158 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -403,14 +403,24 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { if (drawOptionalLine(lineCounter, getSpecialInfo(recipe.mSpecialValue))) { lineCounter++; } - if (GT_Mod.gregtechproxy.mNEIRecipeOwner && recipe.owner != null) { - drawLine(lineCounter, EnumChatFormatting.ITALIC + GT_Utility.trans("225", "Recipe by: ") + recipe.owner.getName()); - lineCounter++; + if (GT_Mod.gregtechproxy.mNEIRecipeOwner) { + if (recipe.owners.size() > 1) { + drawLine(lineCounter, EnumChatFormatting.ITALIC + GT_Utility.trans("226", "Original Recipe by: ") + recipe.owners.get(0).getName()); + lineCounter++; + for (int i = 1; i < recipe.owners.size(); i++) { + drawLine(lineCounter, EnumChatFormatting.ITALIC + GT_Utility.trans("227", "Modified by: ") + recipe.owners.get(i).getName()); + lineCounter++; + } + } else if (recipe.owners.size() > 0) { + drawLine(lineCounter, EnumChatFormatting.ITALIC + GT_Utility.trans("225", "Recipe by: ") + recipe.owners.get(0).getName()); + lineCounter++; + } } if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace && recipe.stackTraces != null) { drawLine(lineCounter, "stackTrace:"); lineCounter++; - for (StackTraceElement stackTrace : recipe.stackTraces) { + // todo: good way to show all stacktraces + for (StackTraceElement stackTrace : recipe.stackTraces.get(0)) { drawLine(lineCounter, stackTrace.toString()); lineCounter++; } |