From ce168d556da7ba05e94a476a60ac2d1386559181 Mon Sep 17 00:00:00 2001
From: tterrag <tterrag1098@gmail.com>
Date: Wed, 9 Aug 2017 16:10:54 -0400
Subject: [PATCH] Better descriptions on dependency version range error screen
 (#4284)

---
 .../fml/common/versioning/Restriction.java    | 21 ++++++++++++++++---
 .../resources/assets/forge/lang/en_US.lang    |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java b/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java
index aa0575cea4..d32b46687d 100644
--- a/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java
+++ b/src/main/java/net/minecraftforge/fml/common/versioning/Restriction.java
@@ -215,10 +215,25 @@ public class Restriction
             if ( getLowerBound().getVersionString().equals(getUpperBound().getVersionString()) )
             {
                 return getLowerBound().getVersionString();
-            }
-            else
+            } 
+            else 
             {
-                return I18n.format("fml.messages.version.restriction.bounded", getLowerBound(), getUpperBound());
+                if (isLowerBoundInclusive() && isUpperBoundInclusive()) 
+                {
+                    return I18n.format("fml.messages.version.restriction.bounded.inclusive", getLowerBound(), getUpperBound());
+                } 
+                else if (isLowerBoundInclusive()) 
+                {
+                    return I18n.format("fml.messages.version.restriction.bounded.upperexclusive", getLowerBound(), getUpperBound());
+                } 
+                else if (isUpperBoundInclusive()) 
+                {
+                    return I18n.format("fml.messages.version.restriction.bounded.lowerexclusive", getLowerBound(), getUpperBound());
+                } 
+                else 
+                {
+                    return I18n.format("fml.messages.version.restriction.bounded.exclusive", getLowerBound(), getUpperBound());
+                }
             }
         }
         else if ( getLowerBound() != null )
diff --git a/src/main/resources/assets/forge/lang/en_US.lang b/src/main/resources/assets/forge/lang/en_US.lang
index ad8e613ff6..32664912dd 100644
--- a/src/main/resources/assets/forge/lang/en_US.lang
+++ b/src/main/resources/assets/forge/lang/en_US.lang
@@ -181,6 +181,10 @@ fml.messages.version.restriction.lower.exclusive=above %s
 fml.messages.version.restriction.upper.inclusive=%s or below
 fml.messages.version.restriction.upper.exclusive=below %s
 fml.messages.version.restriction.bounded=between %s and %s
+fml.messages.version.restriction.bounded.inclusive=between %s and %s (inclusive)
+fml.messages.version.restriction.bounded.exclusive=between %s and %s (exclusive)
+fml.messages.version.restriction.bounded.lowerexclusive=above %s, and %s or below
+fml.messages.version.restriction.bounded.upperexclusive=%s or above, and below %s
 
 fml.button.continue=Continue
 fml.button.open.mods.folder=Open Mods Folder