Reimplement fix for #68 from #110, using IManaStoringItem and multiple mana flask sizes

2019-09-04 11:47:23 +01:00
parent 1ba723ade1
commit 3a788c867c
2 changed files with 187 additions and 76 deletions
@@ -0,0 +1,123 @@
+package electroblob.wizardry.misc;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.item.IManaStoringItem;
+import electroblob.wizardry.item.ItemManaFlask;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.PlayerEvent;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Implements a dynamic crafting recipe for recharging items with mana flasks.
+ *
+ * @author Corail31, Electroblob
+ * @since Wizardry 4.2.2
+ */
+@Mod.EventBusSubscriber
+public class RecipeRechargeWithFlask extends ShapelessOreRecipe {
+
+	private final IManaStoringItem chargeable;
+	private final ItemManaFlask flask;
+
+	/**
+	 * Creates a new charging recipe for the given chargeable item using the given flask item.
+	 * @param chargeable The type of item to be charged
+	 * @param flask The mana flask used to charge the item
+	 */
+	public RecipeRechargeWithFlask(Item chargeable, ItemManaFlask flask){
+		super(null, new ItemStack(chargeable, 1, OreDictionary.WILDCARD_VALUE),
+				new ItemStack(chargeable, 1, OreDictionary.WILDCARD_VALUE), flask);
+		if(!(chargeable instanceof IManaStoringItem)) throw new IllegalArgumentException("Item to be charged must be an instance of IManaStoringItem");
+		this.chargeable = (IManaStoringItem)chargeable;
+		this.flask = flask;
+	}
+
+	@Nonnull
+	@Override
+	public ItemStack getRecipeOutput(){
+		return ItemStack.EMPTY; // According to the javadoc, dynamic recipes are supposed to return an empty stack here
+	}
+
+	@Override
+	public ItemStack getCraftingResult(InventoryCrafting inv){
+		ItemStack result = super.getCraftingResult(inv);//lookupForIngredients(inv, true);
+		rechargeItem(result, inv);
+		return result;
+	}
+
+	@Override
+	public boolean matches(InventoryCrafting inv, World world){
+		ItemStack stack = findItemToCharge(inv);
+		if(!stack.isEmpty() && chargeable.isManaFull(stack)) return false;
+		return super.matches(inv, world);
+		//return !lookupForIngredients(inv, false).isEmpty();
+	}
+
+	private void rechargeItem(ItemStack toCharge, InventoryCrafting inv){
+		if(toCharge.getItem() == chargeable){
+			ItemStack stack = findItemToCharge(inv);
+			if(!stack.isEmpty()) chargeable.setMana(toCharge, chargeable.getMana(stack));
+			chargeable.rechargeMana(toCharge, flask.size.capacity);
+		}else{
+			Wizardry.logger.warn("Tried to recharge item {} with mana flask, but it did not match the recipe result {}!", toCharge.getItem(), chargeable);
+		}
+	}
+
+	private ItemStack findItemToCharge(InventoryCrafting inv){
+		for(int i=0; i<inv.getSizeInventory(); i++){
+			ItemStack ingredient = inv.getStackInSlot(i);
+			if(ingredient.getItem() == chargeable) return ingredient;
+		}
+		return ItemStack.EMPTY;
+	}
+
+//	/** lookup for the needed ingredients && return the rechargeable itemstack */
+//	private ItemStack lookupForIngredients(InventoryCrafting inv, boolean copy){
+//		ItemStack flask = ItemStack.EMPTY;
+//		ItemStack rechargeable = ItemStack.EMPTY;
+//		for(int i = 0; (flask.isEmpty() || rechargeable.isEmpty()) && i < inv.getSizeInventory(); i++){
+//			ItemStack itemstack = inv.getStackInSlot(i);
+//			if(!itemstack.isEmpty()){
+//				if(flask.isEmpty() && itemstack.getItem() == WizardryItems.mana_flask){
+//					flask = itemstack;
+//				}else if(rechargeable.isEmpty() && (itemstack.getItem() instanceof ItemWand || itemstack.getItem() instanceof ItemWizardArmour) && itemstack.getItemDamage() > 0){
+//					rechargeable = copy ? itemstack.copy() : itemstack;
+//				}else{
+//					return ItemStack.EMPTY;
+//				}
+//			}
+//		}
+//		return flask.isEmpty() || rechargeable.isEmpty() ? ItemStack.EMPTY : rechargeable;
+//	}
+
+	@Override
+	public boolean isDynamic(){
+		return true; // Stops it appearing in the recipe book
+	}
+
+	@SubscribeEvent
+	public static void onItemCraftedEvent(PlayerEvent.ItemCraftedEvent event){
+		// getCraftingResult seems to only work for the result that's displayed, not once it is actually taken
+		// This means that although I no longer have to replace the result every tick, I still need to do it here
+		// ... I thought the whole point of the new recipe system was so that I DIDN'T have to do this?!
+		if(event.craftMatrix instanceof InventoryCrafting){
+			for(IRecipe recipe : CraftingManager.REGISTRY){
+				if(recipe instanceof RecipeRechargeWithFlask
+						&& recipe.matches((InventoryCrafting)event.craftMatrix, event.player.world)){
+					// Have to modify the itemstack in the actual event, it cannot be replaced
+					((RecipeRechargeWithFlask)recipe).rechargeItem(event.crafting, (InventoryCrafting)event.craftMatrix);
+				}
+			}
+		}
+	}
+}