Merge pull request #253 from NOVA-Team/refactor/move-events

[RFC] Move all remaining events to their correct event class as inner classes

minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/recipes/MinecraftRecipeRegistry.java

@@ -22,9 +22,8 @@
 
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-import nova.core.recipes.RecipeAddedEvent;
+import nova.core.event.RecipeEvent;
 import nova.core.recipes.RecipeManager;
-import nova.core.recipes.RecipeRemovedEvent;
 import nova.core.recipes.crafting.CraftingRecipe;
 import nova.core.wrapper.mc.forge.v17.util.ReflectionUtil;
 import nova.internal.core.Game;
@@ -58,7 +57,7 @@ public void registerRecipes() {
 
 		RecipeManager recipeManager = Game.recipes();
 
-		List<IRecipe> recipes = (List<IRecipe>) CraftingManager.getInstance().getRecipeList();
+		List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
 		for (IRecipe recipe : recipes) {
 			CraftingRecipe converted = convert(recipe);
 			if (converted != null) {
@@ -84,8 +83,8 @@ private IRecipe convert(CraftingRecipe recipe) {
 		return RecipeConverter.toMinecraft(recipe);
 	}
 
-	private void onNOVARecipeAdded(RecipeAddedEvent<CraftingRecipe> e) {
-		CraftingRecipe recipe = e.getRecipe();
+	private void onNOVARecipeAdded(RecipeEvent.Add<CraftingRecipe> evt) {
+		CraftingRecipe recipe = evt.recipe;
 		if (forwardWrappers.containsKey(recipe)) {
 			return;
 		}
@@ -98,10 +97,10 @@ private void onNOVARecipeAdded(RecipeAddedEvent<CraftingRecipe> e) {
 		CraftingManager.getInstance().getRecipeList().add(minecraftRecipe);
 	}
 
-	private void onNOVARecipeRemoved(RecipeRemovedEvent<CraftingRecipe> e) {
-		IRecipe minecraftRecipe = forwardWrappers.get(e.getRecipe());
+	private void onNOVARecipeRemoved(RecipeEvent.Remove<CraftingRecipe> evt) {
+		IRecipe minecraftRecipe = forwardWrappers.get(evt.recipe);
 
-		forwardWrappers.remove(e.getRecipe());
+		forwardWrappers.remove(evt.recipe);
 		backwardWrappers.remove(minecraftRecipe);
 
 		CraftingManager.getInstance().getRecipeList().remove(minecraftRecipe);

minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/recipes/MinecraftRecipeRegistry.java

@@ -22,9 +22,8 @@
 
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-import nova.core.recipes.RecipeAddedEvent;
+import nova.core.event.RecipeEvent;
 import nova.core.recipes.RecipeManager;
-import nova.core.recipes.RecipeRemovedEvent;
 import nova.core.recipes.crafting.CraftingRecipe;
 import nova.core.wrapper.mc.forge.v18.util.ReflectionUtil;
 import nova.internal.core.Game;
@@ -58,7 +57,7 @@ public void registerRecipes() {
 
 		RecipeManager recipeManager = Game.recipes();
 
-		List<IRecipe> recipes = (List<IRecipe>) CraftingManager.getInstance().getRecipeList();
+		List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
 		for (IRecipe recipe : recipes) {
 			CraftingRecipe converted = convert(recipe);
 			if (converted != null) {
@@ -84,8 +83,8 @@ private IRecipe convert(CraftingRecipe recipe) {
 		return RecipeConverter.toMinecraft(recipe);
 	}
 
-	private void onNOVARecipeAdded(RecipeAddedEvent<CraftingRecipe> e) {
-		CraftingRecipe recipe = e.getRecipe();
+	private void onNOVARecipeAdded(RecipeEvent.Add<CraftingRecipe> evt) {
+		CraftingRecipe recipe = evt.recipe;
 		if (forwardWrappers.containsKey(recipe)) {
 			return;
 		}
@@ -98,10 +97,10 @@ private void onNOVARecipeAdded(RecipeAddedEvent<CraftingRecipe> e) {
 		CraftingManager.getInstance().getRecipeList().add(minecraftRecipe);
 	}
 
-	private void onNOVARecipeRemoved(RecipeRemovedEvent<CraftingRecipe> e) {
-		IRecipe minecraftRecipe = forwardWrappers.get(e.getRecipe());
+	private void onNOVARecipeRemoved(RecipeEvent.Remove<CraftingRecipe> evt) {
+		IRecipe minecraftRecipe = forwardWrappers.get(evt.recipe);
 
-		forwardWrappers.remove(e.getRecipe());
+		forwardWrappers.remove(evt.recipe);
 		backwardWrappers.remove(minecraftRecipe);
 
 		CraftingManager.getInstance().getRecipeList().remove(minecraftRecipe);

src/main/java/nova/core/event/RecipeEvent.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017 NOVA, All rights reserved.
+ * This library is free software, licensed under GNU Lesser General Public License version 3
+ *
+ * This file is part of NOVA.
+ *
+ * NOVA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NOVA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NOVA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package nova.core.event;
+
+import nova.core.event.bus.CancelableEvent;
+import nova.core.recipes.Recipe;
+
+/**
+ * All events related to the recipe.
+ *
+ * @param <T> recipe type
+ * @author ExE Boss
+ */
+public abstract class RecipeEvent<T extends Recipe> extends CancelableEvent {
+	public final T recipe;
+
+	public RecipeEvent(T recipe) {
+		this.recipe = recipe;
+	}
+
+	/**
+	 * A recipe added event is fired when a recipe of the right type has been added
+	 * to the RecipeManager.
+	 *
+	 * @param <T> recipe type
+	 * @author Stan Hebben
+	 */
+	public static class Add<T extends Recipe>  extends RecipeEvent<T>{
+		public Add(T recipe) {
+			super(recipe);
+		}
+	}
+
+	/**
+	 * A recipe removed event is fired when a recipe of the right type has been
+	 * removed from the RecipeManager.
+	 *
+	 * @param <T> recipe type
+	 * @author Stan Hebben
+	 */
+	public static class Remove<T extends Recipe> extends RecipeEvent<T> {
+		public Remove(T recipe) {
+			super(recipe);
+		}
+	}
+}

src/main/java/nova/core/recipes/RecipeManager.java

@@ -20,6 +20,7 @@
 
 package nova.core.recipes;
 
+import nova.core.event.RecipeEvent;
 import nova.core.event.bus.EventBus;
 import nova.core.event.bus.EventListener;
 import nova.core.event.bus.EventListenerHandle;
@@ -30,8 +31,11 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.Spliterator;
+import java.util.stream.Stream;
 
 /**
  * The RecipeManager manages all recipes (of any type) in the game.
@@ -67,16 +71,14 @@ public <T extends Recipe> Collection<T> getRecipes(Class<T> type) {
 		return getRecipeList(type).unmodifiableRecipes;
 	}
 
-	public <T extends Recipe> EventListenerHandle<RecipeAddedEvent<T>> whenRecipeAdded(
-		Class<T> type,
-		EventListener<RecipeAddedEvent<T>> listener) {
-		return getRecipeList(type).recipeAddedListeners.on().bind(listener);
+	public <T extends Recipe> EventListenerHandle<RecipeEvent.Add<T>> whenRecipeAdded(
+		Class<T> type, EventListener<RecipeEvent.Add<T>> listener) {
+		return getRecipeList(type).events.on(RecipeEvent.Add.class).bind(listener);
 	}
 
-	public <T extends Recipe> EventListenerHandle<RecipeRemovedEvent<T>> whenRecipeRemoved(
-		Class<T> type,
-		EventListener<RecipeRemovedEvent<T>> listener) {
-		return getRecipeList(type).recipeRemovedListeners.on().bind(listener);
+	public <T extends Recipe> EventListenerHandle<RecipeEvent.Remove<T>> whenRecipeRemoved(
+		Class<T> type, EventListener<RecipeEvent.Remove<T>> listener) {
+		return getRecipeList(type).events.on(RecipeEvent.Remove.class).bind(listener);
 	}
 
 	// #######################
@@ -103,30 +105,46 @@ private <T extends Recipe> RecipeList<T> collectRecipes(Class<T> type) {
 		return new RecipeList<>(result);
 	}
 
-	private class RecipeList<T extends Recipe> {
+	private class RecipeList<T extends Recipe> implements Iterable<T> {
 		private Set<T> recipes;
 		private Set<T> unmodifiableRecipes;
-		private EventBus<RecipeAddedEvent<T>> recipeAddedListeners;
-		private EventBus<RecipeRemovedEvent<T>> recipeRemovedListeners;
+		private EventBus<RecipeEvent<T>> events;
 
 		private RecipeList(Set<T> recipes) {
 			this.recipes = recipes;
 			this.unmodifiableRecipes = Collections.unmodifiableSet(recipes);
-			this.recipeAddedListeners = new EventBus<>();
-			this.recipeRemovedListeners = new EventBus<>();
+			this.events = new EventBus<>();
 		}
 
 		private void add(T recipe) {
 			if (recipes.add(recipe)) {
-				recipeAddedListeners.publish(new RecipeAddedEvent<>(recipe));
+				events.publish(new RecipeEvent.Add<>(recipe));
 			}
 		}
 
 		private void remove(T recipe) {
 			if (recipes.remove(recipe)) {
-				recipeRemovedListeners.publish(new RecipeRemovedEvent<>(recipe));
+				events.publish(new RecipeEvent.Remove<>(recipe));
 			}
 		}
+
+		@Override
+		public Iterator<T> iterator() {
+			return this.unmodifiableRecipes.iterator();
+		}
+
+		@Override
+		public Spliterator<T> spliterator() {
+			return this.unmodifiableRecipes.spliterator();
+		}
+
+		public Stream<T> stream() {
+			return this.unmodifiableRecipes.stream();
+		}
+
+		public Stream<T> parallelStream() {
+			return this.unmodifiableRecipes.parallelStream();
+		}
 	}
 
 	@Override

src/main/java/nova/core/recipes/crafting/CraftingRecipeManager.java

@@ -16,14 +16,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with NOVA.  If not, see <http://www.gnu.org/licenses/>.
- */package nova.core.recipes.crafting;
+ */
+
+package nova.core.recipes.crafting;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import nova.core.event.RecipeEvent;
 import nova.core.item.Item;
-import nova.core.recipes.RecipeAddedEvent;
 import nova.core.recipes.RecipeManager;
-import nova.core.recipes.RecipeRemovedEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -59,8 +60,8 @@ public void addRecipe(CraftingRecipe recipe) {
 		recipeManager.addRecipe(recipe);
 	}
 
-	/*
-	 * Removes a recipe. Removes if from the global recipe list.
+	/**
+	 * Removes a recipe. Removes it from the global recipe list.
 	 *
 	 * @param recipe {@link CraftingRecipe}
 	 */
@@ -104,25 +105,25 @@ public Optional<CraftingRecipe> getRecipe(CraftingGrid grid) {
 	// ### Private Methods ###
 	// #######################
 
-	private <T extends CraftingRecipe> void onCraftingRecipeAdded(RecipeAddedEvent<T> e) {
-		Optional<Collection<String>> possibleFirstItemIds = e.getRecipe().getPossibleItemsInFirstSlot();
+	private <T extends CraftingRecipe> void onCraftingRecipeAdded(RecipeEvent.Add<T> evt) {
+		Optional<Collection<String>> possibleFirstItemIds = evt.recipe.getPossibleItemsInFirstSlot();
 		if (possibleFirstItemIds.isPresent()) {
 			for (String itemId : possibleFirstItemIds.get()) {
-				staticRecipes.put(itemId, e.getRecipe());
+				staticRecipes.put(itemId, evt.recipe);
 			}
 		} else {
-			dynamicRecipes.add(e.getRecipe());
+			dynamicRecipes.add(evt.recipe);
 		}
 	}
 
-	private <T extends CraftingRecipe> void onCraftingRecipeRemoved(RecipeRemovedEvent<T> e) {
-		Optional<Collection<String>> possibleFirstItemIds = e.getRecipe().getPossibleItemsInFirstSlot();
+	private <T extends CraftingRecipe> void onCraftingRecipeRemoved(RecipeEvent.Remove<T> evt) {
+		Optional<Collection<String>> possibleFirstItemIds = evt.recipe.getPossibleItemsInFirstSlot();
 		if (possibleFirstItemIds.isPresent()) {
 			for (String itemId : possibleFirstItemIds.get()) {
-				staticRecipes.remove(itemId, e.getRecipe());
+				staticRecipes.remove(itemId, evt.recipe);
 			}
 		} else {
-			dynamicRecipes.remove(e.getRecipe());
+			dynamicRecipes.remove(evt.recipe);
 		}
 	}
 }