diff --git a/README.md b/README.md
index 90c3568..9156946 100644
--- a/README.md
+++ b/README.md
@@ -21,4 +21,5 @@ A minecraft plugin to make food go bad.
- 1.2 'Cooked Meats' update
- 1.3 'More Crops' update
- 1.4 'Desserts & Ingredients' update
-- 1.5 'More Food Items' update
\ No newline at end of file
+- 1.5 'More Food Items' update
+- 1.6 'Toggle' update
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d715a28..0943aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
KingdomProgrammers
FoodSpoilage
- v1.5
+ v1.6
jar
FoodSpoilage
diff --git a/src/main/java/spoilagesystem/EventHandlers/CraftItemEventHandler.java b/src/main/java/spoilagesystem/EventHandlers/CraftItemEventHandler.java
index 0c47b6e..e5efb5d 100644
--- a/src/main/java/spoilagesystem/EventHandlers/CraftItemEventHandler.java
+++ b/src/main/java/spoilagesystem/EventHandlers/CraftItemEventHandler.java
@@ -14,42 +14,42 @@ public CraftItemEventHandler(Main plugin) {
public void handle(CraftItemEvent event) {
- if (event.getCurrentItem().getType() == Material.BREAD) {
+ if (event.getCurrentItem().getType() == Material.BREAD && main.storage.Bread != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Bread));
}
- if (event.getCurrentItem().getType() == Material.MUSHROOM_STEW) {
+ if (event.getCurrentItem().getType() == Material.MUSHROOM_STEW && main.storage.Mushroom_Stew != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Mushroom_Stew));
}
- if (event.getCurrentItem().getType() == Material.RABBIT_STEW) {
+ if (event.getCurrentItem().getType() == Material.RABBIT_STEW && main.storage.Rabbit_Stew != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Rabbit_Stew));
}
- if (event.getCurrentItem().getType() == Material.BEETROOT_SOUP) {
+ if (event.getCurrentItem().getType() == Material.BEETROOT_SOUP && main.storage.Beetroot_Soup != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Beetroot_Soup));
}
- if (event.getCurrentItem().getType() == Material.CAKE) {
+ if (event.getCurrentItem().getType() == Material.CAKE && main.storage.Cake != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Cake));
}
- if (event.getCurrentItem().getType() == Material.PUMPKIN_PIE) {
+ if (event.getCurrentItem().getType() == Material.PUMPKIN_PIE && main.storage.Pumpkin_Pie != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Pumpkin_Pie));
}
- if (event.getCurrentItem().getType() == Material.SUGAR) {
+ if (event.getCurrentItem().getType() == Material.SUGAR && main.storage.Sugar != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Sugar));
}
- if (event.getCurrentItem().getType() == Material.COOKIE) {
+ if (event.getCurrentItem().getType() == Material.COOKIE && main.storage.Cookie != 0) {
cancelIfShiftClick(event);
event.setCurrentItem(main.timestamp.assignTimeStamp(event.getCurrentItem(), main.storage.Cookie));
}
diff --git a/src/main/java/spoilagesystem/EventHandlers/FurnaceSmeltEventHandler.java b/src/main/java/spoilagesystem/EventHandlers/FurnaceSmeltEventHandler.java
index 6db1c4d..1047543 100644
--- a/src/main/java/spoilagesystem/EventHandlers/FurnaceSmeltEventHandler.java
+++ b/src/main/java/spoilagesystem/EventHandlers/FurnaceSmeltEventHandler.java
@@ -14,39 +14,39 @@ public FurnaceSmeltEventHandler(Main plugin) {
public void handle(FurnaceSmeltEvent event) {
- if (event.getResult().getType() == Material.COOKED_BEEF) {
+ if (event.getResult().getType() == Material.COOKED_BEEF && main.storage.Cooked_Beef != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Beef));
}
- if (event.getResult().getType() == Material.COOKED_PORKCHOP) {
+ if (event.getResult().getType() == Material.COOKED_PORKCHOP && main.storage.Cooked_Porkchop != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Porkchop));
}
- if (event.getResult().getType() == Material.COOKED_CHICKEN) {
+ if (event.getResult().getType() == Material.COOKED_CHICKEN && main.storage.Cooked_Chicken != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Chicken));
}
- if (event.getResult().getType() == Material.COOKED_SALMON) {
+ if (event.getResult().getType() == Material.COOKED_SALMON && main.storage.Cooked_Salmon != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Salmon));
}
- if (event.getResult().getType() == Material.COOKED_MUTTON) {
+ if (event.getResult().getType() == Material.COOKED_MUTTON && main.storage.Cooked_Mutton != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Mutton));
}
- if (event.getResult().getType() == Material.COOKED_RABBIT) {
+ if (event.getResult().getType() == Material.COOKED_RABBIT && main.storage.Cooked_Rabbit != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Rabbit));
}
- if (event.getResult().getType() == Material.COOKED_COD) {
+ if (event.getResult().getType() == Material.COOKED_COD && main.storage.Cooked_Cod != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Cooked_Cod));
}
- if (event.getResult().getType() == Material.BAKED_POTATO) {
+ if (event.getResult().getType() == Material.BAKED_POTATO && main.storage.Baked_Potato != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Baked_Potato));
}
- if (event.getResult().getType() == Material.DRIED_KELP) {
+ if (event.getResult().getType() == Material.DRIED_KELP && main.storage.Dried_Kelp != 0) {
event.setResult(main.timestamp.assignTimeStamp(event.getResult(), main.storage.Dried_Kelp));
}
diff --git a/src/main/java/spoilagesystem/EventHandlers/ItemSpawnEventHandler.java b/src/main/java/spoilagesystem/EventHandlers/ItemSpawnEventHandler.java
index 8cf1e88..04e2214 100644
--- a/src/main/java/spoilagesystem/EventHandlers/ItemSpawnEventHandler.java
+++ b/src/main/java/spoilagesystem/EventHandlers/ItemSpawnEventHandler.java
@@ -17,101 +17,101 @@ public void handle(ItemSpawnEvent event) {
// crops
- if (event.getEntity().getItemStack().getType() == Material.POTATO) {
+ if (event.getEntity().getItemStack().getType() == Material.POTATO && main.storage.Potato != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Potato));
}
- if (event.getEntity().getItemStack().getType() == Material.CARROT) {
+ if (event.getEntity().getItemStack().getType() == Material.CARROT && main.storage.Carrot != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Carrot));
}
- if (event.getEntity().getItemStack().getType() == Material.BEETROOT) {
+ if (event.getEntity().getItemStack().getType() == Material.BEETROOT && main.storage.Beetroot != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Beetroot));
}
// raw meats
- if (event.getEntity().getItemStack().getType() == Material.BEEF) {
+ if (event.getEntity().getItemStack().getType() == Material.BEEF && main.storage.Beef != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Beef));
}
- if (event.getEntity().getItemStack().getType() == Material.PORKCHOP) {
+ if (event.getEntity().getItemStack().getType() == Material.PORKCHOP && main.storage.Porkchop != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Porkchop));
}
- if (event.getEntity().getItemStack().getType() == Material.CHICKEN) {
+ if (event.getEntity().getItemStack().getType() == Material.CHICKEN && main.storage.Chicken != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Chicken));
}
- if (event.getEntity().getItemStack().getType() == Material.COD) {
+ if (event.getEntity().getItemStack().getType() == Material.COD && main.storage.Cod != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Cod));
}
- if (event.getEntity().getItemStack().getType() == Material.SALMON) {
+ if (event.getEntity().getItemStack().getType() == Material.SALMON && main.storage.Salmon != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Salmon));
}
- if (event.getEntity().getItemStack().getType() == Material.MUTTON) {
+ if (event.getEntity().getItemStack().getType() == Material.MUTTON && main.storage.Mutton != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Mutton));
}
- if (event.getEntity().getItemStack().getType() == Material.RABBIT) {
+ if (event.getEntity().getItemStack().getType() == Material.RABBIT && main.storage.Rabbit != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Rabbit));
}
- if (event.getEntity().getItemStack().getType() == Material.TROPICAL_FISH) {
+ if (event.getEntity().getItemStack().getType() == Material.TROPICAL_FISH && main.storage.Tropical_Fish != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Tropical_Fish));
}
- if (event.getEntity().getItemStack().getType() == Material.PUFFERFISH) {
+ if (event.getEntity().getItemStack().getType() == Material.PUFFERFISH && main.storage.Pufferfish != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Pufferfish));
}
- if (event.getEntity().getItemStack().getType() == Material.WHEAT) {
+ if (event.getEntity().getItemStack().getType() == Material.WHEAT && main.storage.Wheat != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Wheat));
}
- if (event.getEntity().getItemStack().getType() == Material.MELON) {
+ if (event.getEntity().getItemStack().getType() == Material.MELON && main.storage.Melon != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Melon));
}
- if (event.getEntity().getItemStack().getType() == Material.PUMPKIN) {
+ if (event.getEntity().getItemStack().getType() == Material.PUMPKIN && main.storage.Pumpkin != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Pumpkin));
}
- if (event.getEntity().getItemStack().getType() == Material.BROWN_MUSHROOM) {
+ if (event.getEntity().getItemStack().getType() == Material.BROWN_MUSHROOM && main.storage.Brown_Mushroom != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Brown_Mushroom));
}
- if (event.getEntity().getItemStack().getType() == Material.RED_MUSHROOM) {
+ if (event.getEntity().getItemStack().getType() == Material.RED_MUSHROOM && main.storage.Red_Mushroom != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Red_Mushroom));
}
- if (event.getEntity().getItemStack().getType() == Material.NETHER_WART) {
+ if (event.getEntity().getItemStack().getType() == Material.NETHER_WART && main.storage.Nether_Wart != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Nether_Wart));
}
- if (event.getEntity().getItemStack().getType() == Material.MELON_SLICE) {
+ if (event.getEntity().getItemStack().getType() == Material.MELON_SLICE && main.storage.Melon_Slice != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Melon_Slice));
}
- if (event.getEntity().getItemStack().getType() == Material.EGG) {
+ if (event.getEntity().getItemStack().getType() == Material.EGG && main.storage.Egg != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Egg));
}
- if (event.getEntity().getItemStack().getType() == Material.SUGAR_CANE) {
+ if (event.getEntity().getItemStack().getType() == Material.SUGAR_CANE && main.storage.Sugar_Cane != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Sugar_Cane));
}
- if (event.getEntity().getItemStack().getType() == Material.APPLE) {
+ if (event.getEntity().getItemStack().getType() == Material.APPLE && main.storage.Apple != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Apple));
}
- if (event.getEntity().getItemStack().getType() == Material.POISONOUS_POTATO) {
+ if (event.getEntity().getItemStack().getType() == Material.POISONOUS_POTATO && main.storage.Poisonous_Potato != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Poisonous_Potato));
}
- if (event.getEntity().getItemStack().getType() == Material.CHORUS_FRUIT) {
+ if (event.getEntity().getItemStack().getType() == Material.CHORUS_FRUIT && main.storage.Chorus_Fruit != 0) {
event.getEntity().setItemStack(main.timestamp.assignTimeStamp(event.getEntity().getItemStack(), main.storage.Chorus_Fruit));
}
diff --git a/src/main/java/spoilagesystem/Main.java b/src/main/java/spoilagesystem/Main.java
index b178e19..7c8df4d 100644
--- a/src/main/java/spoilagesystem/Main.java
+++ b/src/main/java/spoilagesystem/Main.java
@@ -19,7 +19,7 @@
public final class Main extends JavaPlugin implements Listener {
- public String version = "v1.5";
+ public String version = "v1.6";
// subsystems
public TimeStampSubsystem timestamp = new TimeStampSubsystem(this);
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2fa8461..e6adddf 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
name: FoodSpoilage
-version: 1.5
+version: 1.6
author: DanTheTechMan
main: spoilagesystem.Main
api-version: 1.13