done

Inventory.java

@@ -3,37 +3,70 @@ public class Inventory {
     private Item[] items;
 
     public Inventory(Item[] items) {
-        super();
         this.items = items;
     }
 
-    public void updateQuality() {
-        for (int i = 0; i < items.length; i++) {
-            if (!items[i].getName().equals("Aged Brie")) {
-                if (items[i].getQuality() > 0) {
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        items[i].setQuality(items[i].getQuality() - 1);
-                    }
-                }
-            } else {
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
-                }
-            }
+    public void updateQuality()
+    {
+        for(int i=0;i<items.length;i++)
+        {
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
+            if(items[i].getName().equals("Sulfuras,Hand Of Rangnaros"))
+            {
+                continue;
             }
-
-            if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                  items[i].setQuality(items[i].getQuality() - 1);
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
-                }
+            if(items[i].getName().equals("Aged Brie"))
+            {
+                agedBrieUpdate(i);
+            }
+            else if(items[i].getName().equals("Conjured Mage Water"))
+            {
+                conjuredItemUpdate(i);
+            }
+            else
+            {
+                regularItemUpdate(i);
+            }
+            if(items[i].getQuality()<80)
+            {
+                items[i].setSellIn(items[i].getSellIn()-1);
             }
         }
+    }
+    public void agedBrieUpdate(int i)
+    {
+        if(items[i].getSellIn()>0&&items[i].getQuality()<=49)
+        {
+            items[i].setQuality(items[i].getQuality()+1);
+        }
+        else if(items[i].getSellIn()<0&&items[i].getQuality()<=48)
+        {
+            items[i].setQuality(items[i].getQuality()+2);
+        }
+    }
+    public void regularItemUpdate(int i)
+    {
+        if(items[i].getSellIn()>0&& items[i].getQuality()>0)
+        {
+            items[i].setQuality(items[i].getQuality()-1);
+        }
+        else if(items[i].getSellIn()<0&&items[i].getQuality()>1)
+        {
+            items[i].setQuality(items[i].getQuality()-2);
+        }
+    }
+    public void conjuredItemUpdate(int i)
+    {
+        if(items[i].getSellIn()>0&&items[i].getQuality()>0)
+        {
+            items[i].setQuality(items[i].getQuality()-2);
+        }
+        else if(items[i].getSellIn()<0&&items[i].getQuality()>1)
+        {
+            items[i].setQuality(items[i].getQuality()-4);
+        }
+    }
 }
-}
+
+    
+

package.bluej

@@ -6,16 +6,16 @@ dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
 editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
-objectbench.height=164
-objectbench.width=776
+editor.fx.0.width=683
+editor.fx.0.x=11
+editor.fx.0.y=23
+objectbench.height=234
+objectbench.width=461
 package.divider.horizontal=0.6
-package.divider.vertical=0.6845018450184502
-package.editor.height=364
+package.divider.vertical=0.5553505535055351
+package.editor.height=294
 package.editor.width=674
-package.editor.x=577
+package.editor.x=480
 package.editor.y=61
 package.frame.height=600
 package.frame.width=800