diff --git a/src/items/Item.java b/src/items/Item.java index 86da71f..dd7cb5f 100644 --- a/src/items/Item.java +++ b/src/items/Item.java @@ -73,6 +73,10 @@ public abstract class Item { return recipe; } + protected void setIsRaw() { + isRaw = true; + } + @Override public String toString() { return "Item{" + diff --git a/src/items/type/Fluid.java b/src/items/type/Fluid.java index a8ab3c4..ccafc1c 100644 --- a/src/items/type/Fluid.java +++ b/src/items/type/Fluid.java @@ -3,8 +3,6 @@ package items.type; import items.Item; import items.Recipe; -import java.util.Set; - public abstract class Fluid extends Item { public Fluid(String name, Recipe... recipes) { diff --git a/src/items/type/Ingot.java b/src/items/type/Ingot.java index 113d2b9..f6e6aec 100644 --- a/src/items/type/Ingot.java +++ b/src/items/type/Ingot.java @@ -3,8 +3,6 @@ package items.type; import items.Item; import items.Recipe; -import java.util.Set; - public class Ingot extends Item { public Ingot(String name, Recipe... recipes) { diff --git a/src/items/type/Ore.java b/src/items/type/Ore.java index 55790b2..fa47175 100644 --- a/src/items/type/Ore.java +++ b/src/items/type/Ore.java @@ -3,8 +3,6 @@ package items.type; import items.Item; import items.Recipe; -import java.util.Set; - public class Ore extends Item { public Ore(String name, Recipe... recipes) { @@ -17,7 +15,4 @@ public class Ore extends Item { setIsRaw(); } - private void setIsRaw() { - isRaw = true; - } } diff --git a/src/items/type/Part.java b/src/items/type/Part.java index 087b91c..b75c7bb 100644 --- a/src/items/type/Part.java +++ b/src/items/type/Part.java @@ -3,8 +3,6 @@ package items.type; import items.Item; import items.Recipe; -import java.util.Set; - public class Part extends Item { public Part(String name, Recipe... recipes) { diff --git a/src/items/type/Pickup.java b/src/items/type/Pickup.java index 0c15c97..8c5a893 100644 --- a/src/items/type/Pickup.java +++ b/src/items/type/Pickup.java @@ -3,15 +3,15 @@ package items.type; import items.Item; import items.Recipe; -import java.util.Set; - public class Pickup extends Item { public Pickup(String name, Recipe... recipes) { super(name, recipes); + setIsRaw(); } public Pickup(String name) { super(name); + setIsRaw(); } } diff --git a/src/items/type/ProcessedFluid.java b/src/items/type/ProcessedFluid.java index 7a77a92..af8b1ab 100644 --- a/src/items/type/ProcessedFluid.java +++ b/src/items/type/ProcessedFluid.java @@ -2,8 +2,6 @@ package items.type; import items.Recipe; -import java.util.Set; - public class ProcessedFluid extends Fluid { public ProcessedFluid(String name, Recipe... recipes) { diff --git a/src/items/type/RawFluid.java b/src/items/type/RawFluid.java index 7c4c3b1..072ad8d 100644 --- a/src/items/type/RawFluid.java +++ b/src/items/type/RawFluid.java @@ -2,8 +2,6 @@ package items.type; import items.Recipe; -import java.util.Set; - public class RawFluid extends Fluid { public RawFluid(String name, Recipe... recipes) { @@ -15,8 +13,4 @@ public class RawFluid extends Fluid { super(name); setIsRaw(); } - - private void setIsRaw() { - isRaw = true; - } } diff --git a/src/items/type/Tool.java b/src/items/type/Tool.java index ba19f17..8dacde7 100644 --- a/src/items/type/Tool.java +++ b/src/items/type/Tool.java @@ -3,8 +3,6 @@ package items.type; import items.Item; import items.Recipe; -import java.util.Set; - public class Tool extends Item { public Tool(String name, Recipe... recipes) {