diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java
index 25d3ba3d..78a40968 100644
--- a/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java	
+++ b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java	
@@ -2,171 +2,177 @@ package com.rs2.game.content.consumables;
 
 import java.util.HashMap;
 
+import org.apollo.cache.def.ItemDefinition;
+
 import com.rs2.Constants;
 import com.rs2.game.content.music.sound.SoundList;
 import com.rs2.game.items.impl.RareProtection;
 import com.rs2.game.players.Player;
 import com.rs2.util.Misc;
 
+import static com.rs2.game.content.StaticItemList.*;
+import static com.rs2.game.content.consumables.Food.FoodType.*;
+
 public class Food {
 
+	public static enum FoodType { FOOD, DRINK };
+	
 	public static enum FoodToEat {
-		Easter_Egg(1961, 12, "Easter Egg", 0, "Food", false), 
-		Pumpkin(1959, 14, "Pumpkin", 0, "Food", false), 
-		Half_Jug_of_Wine(1989, 7, "Half Full Wine Jug", 1935, "Drink", false), 
-		CUP_OF_TEA(1978, 2 + Misc.random(1), "Cup of Tea", 1980, "Drink", true), 
-		CUP_OF_TEA2(712, 2 + Misc.random(1), "Cup of Tea", 1980, "Drink", true), 
-		LEMON(2102, 2,"Lemon", 0, "Food", false), LIME(2120, 2, "Lime", 0, "Food", false), 
-		PINEAPPLE(2114, 2, "Pineapple", 0, "Food", false), 
-		CHOCOLATE_BAR(1973, 2, "Chocolate Bar", 0, "Food", false), 
-		Wine(1993, 11, "Wine", 1935, "Drink", false), 
-		MACKEREL(355, 6, "Mackerel", 0, "Food", false),
-		MANTA(391, 22, "Manta Ray", 0, "Food", false), 
-		SHARK(385, 20, "Shark", 0, "Food", false), 
-		LOBSTER(379, 12, "Lobster", 0, "Food", false), 
-		KARAMBWAN(3144, 18, "Karambwan", 0, "Food", false), 
-		TROUT(333, 7, "Trout", 0, "Food", false), 
-		SALMON(329, 9, "Salmon", 0, "Food", false), 
-		SWORDFISH(373, 14, "Swordfish", 0, "Food", false), 
-		TUNA(361, 10, "Tuna", 0, "Food", false), 
-		MONKFISH(7946, 16, "Monkfish", 0, "Food", false), 
-		SEA_TURTLE(397, 21, "Sea Turtle", 0, "Food", false), 
-		CABBAGE(1965, 1, "Cabbage", 0, "Food", false), 
-		CABBAGE_SOUTH_OF_FALADOR(1967, 1, "Cabbage", 0, "Food", false), 
-		SPINACH(1969, 2, "Spinach Roll", 0, "Food", false), 
-		CAKE(1891, 4, "Cake", 1893, "Food", false), 
-		CAKE2(1893, 4, "2/3 Cake", 1895, "Food", false), 
-		SLICE_OF_CAKE(1895, 4, "2/3 Cake", 0, "Food", false), 
-		BASS(365, 13, "Bass", 0, "Food", false), 
-		COD(339, 7, "Cod", 0, "Food", false), 
-		POTATO(1942, 1, "Potato", 0, "Food", false), 
-		BAKED_POTATO(6701, 4, "Baked Potato", 0, "Food", false), 
-		POTATO_WITH_CHEESE(6705, 16, "Potato with Cheese", 0, "Food", false), 
-		EGG_POTATO(7056, 16, "Egg Potato", 0, "Food", false), 
-		CHILLI_POTATO(7054, 14, "Chilli Potato", 0, "Food", false), 
-		MUSHROOM_POTATO(7058, 20, "Mushroom Potato", 0, "Food", false), 
-		TUNA_POTATO(7060, 22, "Tuna Potato", 0, "Food", false), 
-		SHRIMPS(315, 3, "Shrimps", 0, "Food", false), 
-		HERRING(347, 5, "Herring", 0, "Food", false), 
-		SARDINE(325, 4, "Sardine", 0, "Food", false), 
-		CHOCOLATE_CAKE(1897, 5, "Chocolate Cake", 1899, "Food", false), 
-		HALF_CHOCOLATE_CAKE(1899, 5, "2/3 Chocolate Cake", 1901, "Food", false), 
-		CHOCOLATE_SLICE(1901, 5, "Chocolate Slice", 0, "Food", false), 
-		ANCHOVIES(319, 2, "Anchovies", 0, "Food", false), 
-		PLAIN_PIZZA(2289, 7, "Plain Pizza", 2291, "Food", false), 
-		HALF_PLAIN_PIZZA(2291, 7, "1/2 Plain pizza", 0, "Food", false), 
-		MEAT_PIZZA(2293, 8, "Meat Pizza", 2295, "Food", false), 
-		CHICKEN(2140, 3, "Chicken", 0, "Food", false), 
-		MEAT(2142, 2, "Meat", 0, "Food", false), 
-		HALF_MEAT_PIZZA(2295, 8, "1/2 Meat Pizza", 0, "Food", false), 
-		ANCHOVY_PIZZA(2297, 9, "Anchovy Pizza", 2299, "Food", false), 
-		HALF_ANCHOVY_PIZZA(2299, 9, "1/2 Anchovy Pizza", 0, "Food", false), 
-		PINEAPPLE_PIZZA(2301, 11, "Pineapple Pizza", 2303, "Food", false), 
-		HALF_PINEAPPLE_PIZZA(2303, 11, "1/2 Pineapple Pizza", 0, "Food", false), 
-		BREAD(2309, 5, "Bread", 0, "Food", false), 
-		APPLE_PIE(2323, 7, "Apple Pie", 2335, "Food", false), 
-		HALF_APPLE_PIE(2335, 7, "Half Apple Pie", 2313, "Food", false), 
-		REDBERRY_PIE(2325, 5, "Redberry Pie", 2333, "Food", false), 
-		HALF_REDBERRY_PIE(2333, 5, "Half Redberry Pie", 2313, "Food", false), 
-		Ugthanki_kebab(1883, 2, "Ugthanki kebab", 0, "Food", false),
-		SEAWEED(403, 4, "Edible Seaweed", 0, "Food", false),
-		MEAT_PIE(2327, 6, "Meat Pie", 2331, "Food", false), 
-		HALF_MEAT_PIE(2331, 6, "Half Meat Pie", 2313, "Food", false), 
-		SUMMER_PIE(7218, 11, "Summer Pie", 7220, "Food", false), 
-		HALF_SUMMER_PIE(7220, 11, "Half Summer Pie", 2313, "Food", false), 
-		PIKE(351, 8, "Pike", 0, "Food", false), 
-		POTATO_WITH_BUTTER(6703, 14, "Potato with Butter", 0, "Food", false), 
-		SLICED_BANANA(3162, 2, "Sliced Banana", 0, "Food", false),
-		BANANA(1963, 2, "Banana", 0, "Food", false), 
-		PEACH(6883, 8, "Peach", 0, "Food", false), 
-		ORANGE(2108, 2, "Orange", 0, "Food", false), 
-		PINEAPPLE_RINGS(2118, 2, "Pineapple Rings", 0, "Food", false), 
-		PINEAPPLE_CHUNKS(2116, 2, "Pineapple Chunks", 0, "Food", false), 
-		EASTER_EGG(7928, 1, "Easter Egg", 0, "Food", false), 
-		EASTER_EGG2(7929, 1, "Easter Egg", 0, "Food", false), 
-		EASTER_EGG3(7930, 1, "Easter Egg", 0, "Food", false), 
-		EASTER_EGG4(7931, 1, "Easter Egg", 0, "Food", false), 
-		EASTER_EGG5(7932, 1, "Easter Egg", 0, "Food", false), 
-		EASTER_EGG6(7933, 1, "Easter Egg", 0, "Food", false), 
-		PURPLE_SWEETS(10476, 9, "Purple Sweets", 0, "Food", false), 
-		POT_OF_CREAM(2130, 1, "Pot of cream", 0, "Food", false), 
-		FILED_RATION(7934, 9, "Field Ration", 0, "Food", false),
-		STEW(2003, 11, "Stew", 1923, "Food", false), 
-		CURRY(2011, 19, "Curry", 1923, "Drink", false),
-		SPICY_SAUCE(7072, 2, "Spicy sauce", 1923, "Food", false),
-		CHILLI_CON_CARNE(7062, 5, "Chilli con carne", 1923, "Food", false),
-		SCRAMBLED_EGG(7078, 5, "Scrambled egg", 1923, "Food", false),
-		EGG_AND_TOMATO(7064, 8, "Egg and tomato", 1923, "Food", false),
-		FRIED_ONIONS(7085, 5, "Fried onions", 1923, "Food", false),
-		FRIED_MUSHROOMS(7082, 5, "Fried mushrooms", 1923, "Food", false),
-		MUSHROOM_AND_ONION(7066, 11, "Mushroom and onion", 1923, "Food", false),
-		TUNA_AND_CORN(7068, 13, "Tuna and corn", 1923, "Food", false),
-		BANANA_STEW(4016, 11, "Banana stew", 1923, "Food", false),
-		TOAD_CRUNCHIES(2217, 8, "Toad crunchies", 0, "Food", false),
-		SPICY_CRUNCHIES(2213, 7, "Spicy crunchies", 0, "Food", false),
-		WORM_CRUNCHIES(2205, 8, "Worm crunchies", 0, "Food", false),
-		CHOCCHIP_CRUNCHIES(2209, 7, "Chocchip crunchies", 0, "Food", false),
-		FRUIT_BATTA(2277, 11, "Fruit batta", 0, "Food", false),
-		TOAD_BATTA(2255, 11, "Toad batta", 0, "Food", false),
-		WORM_BATTA(2253, 11, "Worm batta", 0, "Food", false),
-		VEGETABLE_BATTA(2281, 11, "Vegetable batta", 0, "Food", false),
-		CHEESE_TOMATO_BATTA(2259, 11, "Cheese+tom batta", 0, "Food", false),
-		WORM_HOLE(2191, 12, "Worm hole", 0, "Food", false),
-		VEG_BALL(2195, 12, "Veg ball", 0, "Food", false),
-		TANGLED_TOADS_LEGS(2187, 15, "Tangled toad's legs", 0, "Food", false),
-		CHOCOLATE_BOMB(2185, 15, "Chocolate bomb", 0, "Food", false),
-		PRE_TOAD_CRUNCH(2243, 7, "Premade t'd crunch", 0, "Food", false),
-		PRE_SPICE_CRUNCH(2241, 7, "Premade s'y crunch", 0, "Food", false),
-		PRE_WORM_CRUNCH(2237, 8, "Premade w'm crun'", 0, "Food", false),
-		PRE_CHOC_CRUNCH(2239, 7, "Premade ch' crunch", 0, "Food", false),
-		PRE_FRUIT_BATTA(2225, 11, "Premade fr't batta", 0, "Food", false),
-		PRE_TOAD_BATTA(2221, 11, "Premade t'd batta", 0, "Food", false),
-		PRE_WORM_BATTA(2219, 11, "Premade w'm batta", 0, "Food", false),
-		PRE_VEG_BATTA(2227, 11, "Premade veg batta", 0, "Food", false),
-		PRE_CHEESETOM_BATTA(2223, 11, "Premade c+t batta", 0, "Food", false),
-		PRE_WORM_HOLE(2233, 12, "Premade worm hole", 0, "Food", false),
-		PRE_VEG_BALL(2235, 12, "Premade veg ball", 0, "Food", false),
-		PRE_TOADS_LEGS(2231, 15, "Premade ttl", 0, "Food", false),
-		PRE_CHOC_BOMB(2229, 15, "Premade choc bomb", 0, "Food", false),
-		FRUIT_BLAST(2084, 9, "Fruit blast", 2026, "Drink", false),
-		PINE_PUNCH(2048, 9, "Pineapple punch", 2026, "Drink", false),
-		PRE_FRUIT_BLAST(2034, 9, "Premade fr' blast", 2026, "Drink", false),
-		PRE_PINE_PUNCH(2036, 9, "Premade p' punch", 2026, "Drink", false),
-		RABBIT(3228, 5, "Cooked rabbit", 0, "Food", false),
-		UGTHANKI_MEAT(1861, 3, "Ugthanki meat", 0, "Food", false),
-		ROAST_BIRD_MEAT(9980, 6, "Roast bird meat", 0, "Food", false),
-		THIN_SNAIL(3369, 5, "Thin snail meat", 0, "Food", false),
-		SPIDER_ON_STICK(6297, 7, "Spider on stick", 0, "Food", false),
-		SPIDER_ON_SHAFT(6299, 7, "Spider on shaft", 0, "Food", false),
-		ROAST_RABBIT(7223, 7, "Roast rabbit", 0, "Food", false),
-		LEAN_SNAIL(3371, 8, "Lean snail meat", 0, "Food", false),
-		ROAST_BEAST_MEAT(9988, 8, "Roast beast meat", 0, "Food", false),
-		FAT_SNAIL(3373, 9, "Fat snail meat", 0, "Food", false),
-		SLIMY_EEL(3381, 8, "Cooked slimy eel", 0, "Food", false),
-		COOKED_CHOMPY(2878, 10, "Cooked chompy", 0, "Food", false),
-		COOKED_FISHCAKE(7530, 11, "Cooked fishcake", 0, "Food", false),
-		RAINBOW_FISH(10136, 11, "Rainbow fish", 0, "Food", false),
-		CAVE_EEL(5003, 9, "Cave eel", 0, "Food", false),
-		COOKED_JUBBLY(7568, 15, "Cooked jubbly", 0, "Food", false),
-		LAVA_EEL(2149, 11, "Lava eel", 0, "Food", false),
-		CHOCOLATEY_MILK(1977, 4, "Chocolatey milk", 1925, "Drink", false),
-		BANDAGES(4049, 3, "Bandages", 0, "Food", false),
-		TOMATO(1982, 2, "Tomato", 0, "Food", false),
-        CHEESE(1985, 2, "Cheese", 0, "Food", false);                
+		Easter_Egg_(EASTER_EGG, 12, DWARF_REMAINS, FOOD, false),
+		Pumpkin_(PUMPKIN, 14, DWARF_REMAINS, FOOD, false),
+		Half_Jug_of_Wine_(HALF_FULL_WINE_JUG, 7, JUG, DRINK, false),
+		CUP_OF_TEA_(CUP_OF_TEA_1978, 2, EMPTY_CUP, DRINK, true),
+		CUP_OF_TEA2_(CUP_OF_TEA, 2, EMPTY_CUP, DRINK, true),
+		LEMON_(LEMON, 2, DWARF_REMAINS, FOOD, false),
+		LIME_(LIME, 2, DWARF_REMAINS, FOOD, false),
+		PINEAPPLE_(PINEAPPLE, 2, DWARF_REMAINS, FOOD, false),
+		CHOCOLATE_BAR_(CHOCOLATE_BAR, 2, DWARF_REMAINS, FOOD, false),
+		Wine_(JUG_OF_WINE, 11, JUG, DRINK, false),
+		MACKEREL_(MACKEREL, 6, DWARF_REMAINS, FOOD, false),
+		MANTA_(MANTA_RAY, 22, DWARF_REMAINS, FOOD, false),
+		SHARK_(SHARK, 20, DWARF_REMAINS, FOOD, false),
+		LOBSTER_(LOBSTER, 12, DWARF_REMAINS, FOOD, false),
+		KARAMBWAN_(COOKED_KARAMBWAN, 18, DWARF_REMAINS, FOOD, false),
+		TROUT_(TROUT, 7, DWARF_REMAINS, FOOD, false),
+		SALMON_(SALMON, 9, DWARF_REMAINS, FOOD, false),
+		SWORDFISH_(SWORDFISH, 14, DWARF_REMAINS, FOOD, false),
+		TUNA_(TUNA, 10, DWARF_REMAINS, FOOD, false),
+		MONKFISH_(MONKFISH, 16, DWARF_REMAINS, FOOD, false),
+		SEA_TURTLE_(SEA_TURTLE, 21, DWARF_REMAINS, FOOD, false),
+		CABBAGE_(CABBAGE, 1, DWARF_REMAINS, FOOD, false),
+		CABBAGE_SOUTH_OF_FALADOR_(CABBAGE_1967, 1, DWARF_REMAINS, FOOD, false),
+		SPINACH_(SPINACH_ROLL, 2, DWARF_REMAINS, FOOD, false),
+		CAKE_(CAKE, 4, _23_CAKE, FOOD, false),
+		CAKE2_(_23_CAKE, 4, SLICE_OF_CAKE, FOOD, false),
+		SLICE_OF_CAKE_(SLICE_OF_CAKE, 4, DWARF_REMAINS, FOOD, false),
+		BASS_(BASS, 13, DWARF_REMAINS, FOOD, false),
+		COD_(COD, 7, DWARF_REMAINS, FOOD, false),
+		POTATO_(POTATO, 1, DWARF_REMAINS, FOOD, false),
+		BAKED_POTATO_(BAKED_POTATO, 4, DWARF_REMAINS, FOOD, false),
+		POTATO_WITH_CHEESE_(POTATO_WITH_CHEESE, 16, DWARF_REMAINS, FOOD, false),
+		EGG_POTATO_(EGG_POTATO, 16, DWARF_REMAINS, FOOD, false),
+		CHILLI_POTATO_(CHILLI_POTATO, 14, DWARF_REMAINS, FOOD, false),
+		MUSHROOM_POTATO_(MUSHROOM_POTATO, 20, DWARF_REMAINS, FOOD, false),
+		TUNA_POTATO_(TUNA_POTATO, 22, DWARF_REMAINS, FOOD, false),
+		SHRIMPS_(SHRIMPS, 3, DWARF_REMAINS, FOOD, false),
+		HERRING_(HERRING, 5, DWARF_REMAINS, FOOD, false),
+		SARDINE_(SARDINE, 4, DWARF_REMAINS, FOOD, false),
+		CHOCOLATE_CAKE_(CHOCOLATE_CAKE, 5, _23_CHOCOLATE_CAKE, FOOD, false),
+		HALF_CHOCOLATE_CAKE_(_23_CHOCOLATE_CAKE, 5, CHOCOLATE_SLICE, FOOD, false),
+		CHOCOLATE_SLICE_(CHOCOLATE_SLICE, 5, DWARF_REMAINS, FOOD, false),
+		ANCHOVIES_(ANCHOVIES, 2, DWARF_REMAINS, FOOD, false),
+		PLAIN_PIZZA_(PLAIN_PIZZA, 7, _12_PLAIN_PIZZA, FOOD, false),
+		HALF_PLAIN_PIZZA_(_12_PLAIN_PIZZA, 7, DWARF_REMAINS, FOOD, false),
+		MEAT_PIZZA_(MEAT_PIZZA, 8, _12_MEAT_PIZZA, FOOD, false),
+		CHICKEN_(COOKED_CHICKEN, 3, DWARF_REMAINS, FOOD, false),
+		MEAT_(COOKED_MEAT, 2, DWARF_REMAINS, FOOD, false),
+		HALF_MEAT_PIZZA_(_12_MEAT_PIZZA, 8, DWARF_REMAINS, FOOD, false),
+		ANCHOVY_PIZZA_(ANCHOVY_PIZZA, 9, _12_ANCHOVY_PIZZA, FOOD, false),
+		HALF_ANCHOVY_PIZZA_(_12_ANCHOVY_PIZZA, 9, DWARF_REMAINS, FOOD, false),
+		PINEAPPLE_PIZZA_(PINEAPPLE_PIZZA, 11, _12PINEAPPLE_PIZZA, FOOD, false),
+		HALF_PINEAPPLE_PIZZA_(_12PINEAPPLE_PIZZA, 11, DWARF_REMAINS, FOOD, false),
+		BREAD_(BREAD, 5, DWARF_REMAINS, FOOD, false),
+		APPLE_PIE_(APPLE_PIE, 7, HALF_AN_APPLE_PIE, FOOD, false),
+		HALF_APPLE_PIE_(HALF_AN_APPLE_PIE, 7, PIE_DISH, FOOD, false),
+		REDBERRY_PIE_(REDBERRY_PIE, 5, HALF_A_REDBERRY_PIE, FOOD, false),
+		HALF_REDBERRY_PIE_(HALF_A_REDBERRY_PIE, 5, PIE_DISH, FOOD, false),
+		Ugthanki_kebab_(UGTHANKI_KEBAB, 2, DWARF_REMAINS, FOOD, false),
+		SEAWEED_(EDIBLE_SEAWEED, 4, DWARF_REMAINS, FOOD, false),
+		MEAT_PIE_(MEAT_PIE, 6, HALF_A_MEAT_PIE, FOOD, false),
+		HALF_MEAT_PIE_(HALF_A_MEAT_PIE, 6, PIE_DISH, FOOD, false),
+		SUMMER_PIE_(SUMMER_PIE, 11, HALF_A_SUMMER_PIE, FOOD, false),
+		HALF_SUMMER_PIE_(HALF_A_SUMMER_PIE, 11, PIE_DISH, FOOD, false),
+		PIKE_(PIKE, 8, DWARF_REMAINS, FOOD, false),
+		POTATO_WITH_BUTTER_(POTATO_WITH_BUTTER, 14, DWARF_REMAINS, FOOD, false),
+		SLICED_BANANA_(SLICED_BANANA, 2, DWARF_REMAINS, FOOD, false),
+		BANANA_(BANANA, 2, DWARF_REMAINS, FOOD, false),
+		PEACH_(PEACH, 8, DWARF_REMAINS, FOOD, false),
+		ORANGE_(ORANGE, 2, DWARF_REMAINS, FOOD, false),
+		PINEAPPLE_RINGS_(PINEAPPLE_RING, 2, DWARF_REMAINS, FOOD, false),
+		PINEAPPLE_CHUNKS_(PINEAPPLE_CHUNKS, 2, DWARF_REMAINS, FOOD, false),
+		EASTER_EGG_(EASTER_EGG_7928, 1, DWARF_REMAINS, FOOD, false),
+		EASTER_EGG2_(EASTER_EGG_7929, 1, DWARF_REMAINS, FOOD, false),
+		EASTER_EGG3_(EASTER_EGG_7930, 1, DWARF_REMAINS, FOOD, false),
+		EASTER_EGG4_(EASTER_EGG_7931, 1, DWARF_REMAINS, FOOD, false),
+		EASTER_EGG5_(EASTER_EGG_7932, 1, DWARF_REMAINS, FOOD, false),
+		EASTER_EGG6_(EASTER_EGG_7933, 1, DWARF_REMAINS, FOOD, false),
+		PURPLE_SWEETS_(10476, 9, DWARF_REMAINS, FOOD, false),
+		POT_OF_CREAM_(POT_OF_CREAM, 1, DWARF_REMAINS, FOOD, false),
+		FILED_RATION_(FIELD_RATION, 9, DWARF_REMAINS, FOOD, false),
+		STEW_(STEW, 11, BOWL, FOOD, false),
+		CURRY_(CURRY, 19, BOWL, DRINK, false),
+		SPICY_SAUCE_(SPICY_SAUCE, 2, BOWL, FOOD, false),
+		CHILLI_CON_CARNE_(CHILLI_CON_CARNE, 5, BOWL, FOOD, false),
+		SCRAMBLED_EGG_(SCRAMBLED_EGG, 5, BOWL, FOOD, false),
+		EGG_AND_TOMATO_(EGG_AND_TOMATO, 8, BOWL, FOOD, false),
+		FRIED_ONIONS_(FRIED_ONIONS_7085, 5, BOWL, FOOD, false),
+		FRIED_MUSHROOMS_(FRIED_MUSHROOMS, 5, BOWL, FOOD, false),
+		MUSHROOM_AND_ONION_(MUSHROOM__ONION, 11, BOWL, FOOD, false),
+		TUNA_AND_CORN_(TUNA_AND_CORN, 13, BOWL, FOOD, false),
+		BANANA_STEW_(BANANA_STEW, 11, BOWL, FOOD, false),
+		TOAD_CRUNCHIES_(TOAD_CRUNCHIES, 8, DWARF_REMAINS, FOOD, false),
+		SPICY_CRUNCHIES_(SPICY_CRUNCHIES, 7, DWARF_REMAINS, FOOD, false),
+		WORM_CRUNCHIES_(WORM_CRUNCHIES, 8, DWARF_REMAINS, FOOD, false),
+		CHOCCHIP_CRUNCHIES_(CHOCCHIP_CRUNCHIES, 7, DWARF_REMAINS, FOOD, false),
+		FRUIT_BATTA_(FRUIT_BATTA_2277, 11, DWARF_REMAINS, FOOD, false),
+		TOAD_BATTA_(TOAD_BATTA_2255, 11, DWARF_REMAINS, FOOD, false),
+		WORM_BATTA_(WORM_BATTA_2253, 11, DWARF_REMAINS, FOOD, false),
+		VEGETABLE_BATTA_(VEGETABLE_BATTA_2281, 11, DWARF_REMAINS, FOOD, false),
+		CHEESE_TOMATO_BATTA_(CHEESETOM_BATTA_2259, 11, DWARF_REMAINS, FOOD, false),
+		WORM_HOLE_(WORM_HOLE, 12, DWARF_REMAINS, FOOD, false),
+		VEG_BALL_(VEG_BALL, 12, DWARF_REMAINS, FOOD, false),
+		TANGLED_TOADS_LEGS_(TANGLED_TOADS_LEGS, 15, DWARF_REMAINS, FOOD, false),
+		CHOCOLATE_BOMB_(CHOCOLATE_BOMB, 15, DWARF_REMAINS, FOOD, false),
+		PRE_TOAD_CRUNCH_(TOAD_CRUNCHIES_2243, 7, DWARF_REMAINS, FOOD, false),
+		PRE_SPICE_CRUNCH_(SPICY_CRUNCHIES_2241, 7, DWARF_REMAINS, FOOD, false),
+		PRE_WORM_CRUNCH_(WORM_CRUNCHIES_2237, 8, DWARF_REMAINS, FOOD, false),
+		PRE_CHOC_CRUNCH_(CHOCCHIP_CRUNCHIES_2239, 7, DWARF_REMAINS, FOOD, false),
+		PRE_FRUIT_BATTA_(FRUIT_BATTA, 11, DWARF_REMAINS, FOOD, false),
+		PRE_TOAD_BATTA_(TOAD_BATTA, 11, DWARF_REMAINS, FOOD, false),
+		PRE_WORM_BATTA_(WORM_BATTA, 11, DWARF_REMAINS, FOOD, false),
+		PRE_VEG_BATTA_(VEGETABLE_BATTA, 11, DWARF_REMAINS, FOOD, false),
+		PRE_CHEESETOM_BATTA_(CHEESETOM_BATTA, 11, DWARF_REMAINS, FOOD, false),
+		PRE_WORM_HOLE_(WORM_HOLE_2233, 12, DWARF_REMAINS, FOOD, false),
+		PRE_VEG_BALL_(VEG_BALL_2235, 12, DWARF_REMAINS, FOOD, false),
+		PRE_TOADS_LEGS_(TANGLED_TOADS_LEGS_2231, 15, DWARF_REMAINS, FOOD, false),
+		PRE_CHOC_BOMB_(CHOCOLATE_BOMB_2229, 15, DWARF_REMAINS, FOOD, false),
+		FRUIT_BLAST_(FRUIT_BLAST_2084, 9, COCKTAIL_GLASS, DRINK, false),
+		PINE_PUNCH_(PINEAPPLE_PUNCH_2048, 9, COCKTAIL_GLASS, DRINK, false),
+		PRE_FRUIT_BLAST_(FRUIT_BLAST, 9, COCKTAIL_GLASS, DRINK, false),
+		PRE_PINE_PUNCH_(PINEAPPLE_PUNCH, 9, COCKTAIL_GLASS, DRINK, false),
+		RABBIT_(COOKED_RABBIT, 5, DWARF_REMAINS, FOOD, false),
+		UGTHANKI_MEAT_(UGTHANKI_MEAT, 3, DWARF_REMAINS, FOOD, false),
+		ROAST_BIRD_MEAT_(9980, 6, DWARF_REMAINS, FOOD, false),
+		THIN_SNAIL_(THIN_SNAIL_MEAT, 5, DWARF_REMAINS, FOOD, false),
+		SPIDER_ON_STICK_(SPIDER_ON_STICK_6297, 7, DWARF_REMAINS, FOOD, false),
+		SPIDER_ON_SHAFT_(SPIDER_ON_SHAFT_6299, 7, DWARF_REMAINS, FOOD, false),
+		ROAST_RABBIT_(ROAST_RABBIT, 7, DWARF_REMAINS, FOOD, false),
+		LEAN_SNAIL_(LEAN_SNAIL_MEAT, 8, DWARF_REMAINS, FOOD, false),
+		ROAST_BEAST_MEAT_(9988, 8, DWARF_REMAINS, FOOD, false),
+		FAT_SNAIL_(FAT_SNAIL_MEAT, 9, DWARF_REMAINS, FOOD, false),
+		SLIMY_EEL_(COOKED_SLIMY_EEL, 8, DWARF_REMAINS, FOOD, false),
+		COOKED_CHOMPY_(COOKED_CHOMPY, 10, DWARF_REMAINS, FOOD, false),
+		COOKED_FISHCAKE_(COOKED_FISHCAKE, 11, DWARF_REMAINS, FOOD, false),
+		RAINBOW_FISH_(10136, 11, DWARF_REMAINS, FOOD, false),
+		CAVE_EEL_(CAVE_EEL, 9, DWARF_REMAINS, FOOD, false),
+		COOKED_JUBBLY_(COOKED_JUBBLY, 15, DWARF_REMAINS, FOOD, false),
+		LAVA_EEL_(LAVA_EEL, 11, DWARF_REMAINS, FOOD, false),
+		CHOCOLATEY_MILK_(CHOCOLATEY_MILK, 4, BUCKET, DRINK, false),
+		BANDAGES_(BANDAGES, 3, DWARF_REMAINS, FOOD, false),
+		TOMATO_(TOMATO, 2, DWARF_REMAINS, FOOD, false),
+		CHEESE_(CHEESE, 2, DWARF_REMAINS, FOOD, false);      
 
 		private int id;
 		private int heal;
-		private String name;
 		private int replace;
-		private String type;
+		private FoodType type;
 		private boolean foodEffect;
 
-		private FoodToEat(int id, int heal, String name, int replaceWith,
-				String type, boolean foodEffect) {
+		private FoodToEat(int id, int heal, int replaceWith, FoodType type,
+				boolean foodEffect) {
 			this.id = id;
 			this.heal = heal;
-			this.name = name;
-			replace = replaceWith;
+			this.replace = replaceWith;
 			this.type = type;
 			this.foodEffect = foodEffect;
 		}
@@ -179,7 +185,7 @@ public class Food {
 			return id;
 		}
 
-		private String getType() {
+		private FoodType getType() {
 			return type;
 		}
 
@@ -187,10 +193,6 @@ public class Food {
 			return heal;
 		}
 
-		public String getName() {
-			return name;
-		}
-
 		public int replaceWith() {
 			return replace;
 		}
@@ -231,7 +233,7 @@ public class Food {
 			if (f.replaceWith() > 0) {
 				player.getItemAssistant().addItem(f.replaceWith(), 1);
 			}
-			if (f.getType().equalsIgnoreCase("Food")) {
+			if (f.getType() == FoodType.FOOD) {
 				if (id == 1965) {
 					player.getPacketSender().sendMessage("You eat the cabbage. Yuck!");
 				} else if (id == 1967){
@@ -239,20 +241,20 @@ public class Food {
 				} else if (id == 2185){
 					player.getPacketSender().sendMessage("You pour over an obscene amount of cream and dust with chocolate dust. Mmmm.");					
 				} else {
-					player.getPacketSender().sendMessage("You eat the " + f.getName() + ".");
+					player.getPacketSender().sendMessage("You eat the " + ItemDefinition.lookup(f.id).getName() + ".");
 					player.getPacketSender().sendMessage("It heals some health.");
 				}
-			} else if (f.getType().equalsIgnoreCase("Drink")) {
+			} else if (f.getType() == FoodType.DRINK) {
 				if (id == 2955) {
 					player.getPacketSender().sendMessage("It tastes like something just died in your mouth.");
 				} else {
-					player.getPacketSender().sendMessage("You drink the " + f.getName() + ".");
+					player.getPacketSender().sendMessage("You drink the " + ItemDefinition.lookup(f.id).getName() + ".");
 				}
 			}
 
-			if (f.getType().equalsIgnoreCase("Food")) {
+			if (f.getType() == FoodType.FOOD) {
 				player.getPacketSender().sendSound(SoundList.FOOD_EAT, 100, 0);
-			} else if (f.getType().equalsIgnoreCase("Drink")) {
+			} else if (f.getType() == FoodType.DRINK) {
 				player.getPacketSender().sendSound(SoundList.DRINK, 100, 0);
 			}
 			player.foodDelay = System.currentTimeMillis();
diff --git a/2006Scape Server/src/main/java/com/rs2/util/ConstantReplacer.java b/2006Scape Server/src/main/java/com/rs2/util/ConstantReplacer.java
index f35ae767..e12b3916 100644
--- a/2006Scape Server/src/main/java/com/rs2/util/ConstantReplacer.java	
+++ b/2006Scape Server/src/main/java/com/rs2/util/ConstantReplacer.java	
@@ -19,10 +19,10 @@ import com.rs2.game.content.StaticObjectList;
  */
 public class ConstantReplacer {
 
-	private static String [] skipped = {  "bevAnim", "effect1", "effect2", "effect3", "effect4" };
-	private static String enum_clazz = "com.rs2.game.content.consumables.Beverages$beverageData";
+	private static String [] skipped = { "heal", "name", "type", "foodEffect" };
+	private static String enum_clazz = "com.rs2.game.content.consumables.Food$FoodToEat";
 	
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) throws IllegalArgumentException, IllegalAccessException, ClassNotFoundException {
 		Map<Integer, String> items = buildNameMap(StaticItemList.class);
 		Map<Integer, String> npcs = buildNameMap(StaticNpcList.class);
 		Map<Integer, String> objects = buildNameMap(StaticObjectList.class);
@@ -34,7 +34,17 @@ public class ConstantReplacer {
 		}
 		if(skipped == null)
 			buildSkipped(c);
-		Field enumfield = c.getDeclaredField("ENUM$VALUES");
+		Field enumfield = null;
+		try {
+			enumfield = c.getDeclaredField("ENUM$VALUES");
+		} catch (NoSuchFieldException e) {
+			try {
+				enumfield = c.getDeclaredField("$VALUES");
+			} catch (NoSuchFieldException e1) {
+				e1.printStackTrace();
+				return;
+			} 
+		} 
 		enumfield.setAccessible(true);
 
 		Enum[] values = (Enum[]) enumfield.get(null);
@@ -53,6 +63,8 @@ public class ConstantReplacer {
 				f.setAccessible(true);
 				if(f.getGenericType().getTypeName() == "int")
 					out += ((!skip(f.getName()) ? items.get(f.getInt(m)) : f.getInt(m)) + ", ");
+				else if(f.getType() == (String.class))
+					out += "\""+  f.get(m) +"\", ";
 				else
 					out +=  f.get(m) + ", ";
 			}
@@ -62,7 +74,7 @@ public class ConstantReplacer {
 		}
 	}
 	
-	private static void buildSkipped(Class<?> c) throws Exception {
+	private static void buildSkipped(Class<?> c) {
 		Field[] flds = c.getDeclaredFields();
 		String out = ("private static String [] skipped = { ");
 		for (Field f : flds) {
@@ -95,4 +107,4 @@ public class ConstantReplacer {
 		}
 		return false;
 	}
-}
+}
\ No newline at end of file