Attempt to fix 1.16.3 branch's issues on the repository

Added the original 'wayoftime' folder back, so see if that fixed the multiple folder issue.

src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java

@@ -0,0 +1,38 @@
+package wayoftime.bloodmagic.event;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.eventbus.api.Cancelable;
+import net.minecraftforge.eventbus.api.Event;
+
+@Cancelable
+public class ItemBindEvent extends Event
+{
+	private final PlayerEntity player;
+	private final ItemStack itemStack;
+
+	/**
+	 * This event is called whenever a player attempts to bind a
+	 * {@link wayoftime.bloodmagic.iface.IBindable} item.
+	 *
+	 * @param player    The player doing the binding
+	 * @param itemStack The {@link ItemStack} that the player is binding
+	 *                  <p>
+	 *                  This event is {@link Cancelable}.<br>
+	 */
+	public ItemBindEvent(PlayerEntity player, ItemStack itemStack)
+	{
+		this.player = player;
+		this.itemStack = itemStack;
+	}
+
+	public PlayerEntity getNewOwner()
+	{
+		return player;
+	}
+
+	public ItemStack getBindingStack()
+	{
+		return itemStack;
+	}
+}

src/main/java/wayoftime/bloodmagic/event/RitualEvent.java

@@ -0,0 +1,151 @@
+package wayoftime.bloodmagic.event;
+
+import java.util.UUID;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.eventbus.api.Cancelable;
+import net.minecraftforge.eventbus.api.Event;
+import wayoftime.bloodmagic.ritual.IMasterRitualStone;
+import wayoftime.bloodmagic.ritual.Ritual;
+import wayoftime.bloodmagic.ritual.imperfect.IImperfectRitualStone;
+import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual;
+
+public class RitualEvent extends Event
+{
+	private final IMasterRitualStone mrs;
+	private final UUID ownerId;
+	private final Ritual ritual;
+
+	private RitualEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual)
+	{
+		this.mrs = mrs;
+		this.ownerId = ownerId;
+		this.ritual = ritual;
+	}
+
+	public IMasterRitualStone getRitualStone()
+	{
+		return mrs;
+	}
+
+	public UUID getOwnerId()
+	{
+		return ownerId;
+	}
+
+	public Ritual getRitual()
+	{
+		return ritual;
+	}
+
+	/**
+	 * This event is called when a ritual is activated. If cancelled, it will not
+	 * activate.
+	 * <p>
+	 * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)}
+	 */
+	@Cancelable
+	public static class RitualActivatedEvent extends RitualEvent
+	{
+
+		private final PlayerEntity player;
+		private final ItemStack crystalStack;
+		private final int crystalTier;
+
+		public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, PlayerEntity player, ItemStack activationCrystal, int crystalTier)
+		{
+			super(mrs, ownerId, ritual);
+
+			this.player = player;
+			this.crystalStack = activationCrystal;
+			this.crystalTier = crystalTier;
+		}
+
+		public PlayerEntity getPlayer()
+		{
+			return player;
+		}
+
+		public ItemStack getCrystalStack()
+		{
+			return crystalStack;
+		}
+
+		public int getCrystalTier()
+		{
+			return crystalTier;
+		}
+	}
+
+	/**
+	 * This event is called when a Ritual effect is performed. If cancelled, the
+	 * effect will not happen.
+	 * <p>
+	 * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)}
+	 */
+	@Cancelable
+	public static class RitualRunEvent extends RitualEvent
+	{
+
+		public RitualRunEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual)
+		{
+			super(mrs, ownerId, ritual);
+		}
+	}
+
+	/**
+	 * This event is called when a Ritual is stopped by a {@link Ritual.BreakType}.
+	 * <p>
+	 * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)}
+	 */
+	public static class RitualStopEvent extends RitualEvent
+	{
+
+		private final Ritual.BreakType method;
+
+		public RitualStopEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, Ritual.BreakType method)
+		{
+			super(mrs, ownerId, ritual);
+
+			this.method = method;
+		}
+
+		public Ritual.BreakType getMethod()
+		{
+			return method;
+		}
+	}
+
+	@Cancelable
+	public static class ImperfectRitualActivatedEvent extends Event
+	{
+
+		private final IImperfectRitualStone ims;
+		private final PlayerEntity activator;
+		private final ImperfectRitual imperfectRitual;
+
+		public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, PlayerEntity activator, ImperfectRitual imperfectRitual)
+		{
+			this.ims = ims;
+			this.activator = activator;
+			this.imperfectRitual = imperfectRitual;
+		}
+
+		public IImperfectRitualStone getRitualStone()
+		{
+			return ims;
+		}
+
+		public PlayerEntity getActivator()
+		{
+			return activator;
+		}
+
+		public ImperfectRitual getImperfectRitual()
+		{
+			return imperfectRitual;
+		}
+	}
+}

src/main/java/wayoftime/bloodmagic/event/SacrificeKnifeUsedEvent.java

@@ -0,0 +1,37 @@
+package wayoftime.bloodmagic.event;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraftforge.eventbus.api.Cancelable;
+import net.minecraftforge.eventbus.api.Event;
+
+@Cancelable
+public class SacrificeKnifeUsedEvent extends Event
+{
+	public final PlayerEntity player;
+	public final int healthDrained;
+	public int lpAdded;
+	public boolean shouldDrainHealth;
+	public boolean shouldFillAltar;
+
+	/**
+	 * This event is called whenever a player attempts to use a
+	 * {@link WayofTime.bloodmagic.item.ItemSacrificialDagger} to self-sacrifice
+	 * near an altar.
+	 *
+	 * @param player            The player doing the sacrificing
+	 * @param shouldDrainHealth Determines whether or not health is lost
+	 * @param shouldFillAltar   Determines whether or not an altar should be filled
+	 * @param hp                Amount of health lost
+	 * @param lpAdded           Amount of LP added to the altar
+	 *                          <p>
+	 *                          This event is {@link Cancelable}.<br>
+	 */
+	public SacrificeKnifeUsedEvent(PlayerEntity player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded)
+	{
+		this.player = player;
+		this.shouldDrainHealth = shouldDrainHealth;
+		this.shouldFillAltar = shouldFillAltar;
+		this.healthDrained = hp;
+		this.lpAdded = lpAdded;
+	}
+}

src/main/java/wayoftime/bloodmagic/event/SoulNetworkEvent.java

@@ -0,0 +1,116 @@
+package wayoftime.bloodmagic.event;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.eventbus.api.Cancelable;
+import net.minecraftforge.eventbus.api.Event;
+import wayoftime.bloodmagic.core.data.SoulNetwork;
+import wayoftime.bloodmagic.core.data.SoulTicket;
+
+public class SoulNetworkEvent extends Event
+{
+	private final SoulNetwork network;
+	private SoulTicket ticket;
+
+	public SoulNetworkEvent(SoulNetwork network, SoulTicket ticket)
+	{
+		this.network = network;
+		this.ticket = ticket;
+	}
+
+	public SoulNetwork getNetwork()
+	{
+		return network;
+	}
+
+	public SoulTicket getTicket()
+	{
+		return ticket;
+	}
+
+	public void setTicket(SoulTicket ticket)
+	{
+		this.ticket = ticket;
+	}
+
+	@Cancelable
+	public static class Syphon extends SoulNetworkEvent
+	{
+		private boolean shouldDamage;
+
+		public Syphon(SoulNetwork network, SoulTicket ticket)
+		{
+			super(network, ticket);
+		}
+
+		public boolean shouldDamage()
+		{
+			return shouldDamage;
+		}
+
+		public void setShouldDamage(boolean shouldDamage)
+		{
+			this.shouldDamage = shouldDamage;
+		}
+
+		public static class Item extends Syphon
+		{
+
+			private final ItemStack stack;
+
+			public Item(SoulNetwork network, SoulTicket ticket, ItemStack stack)
+			{
+				super(network, ticket);
+
+				this.stack = stack;
+			}
+
+			public ItemStack getStack()
+			{
+				return stack;
+			}
+		}
+
+		public static class User extends Syphon
+		{
+
+			private final PlayerEntity user;
+
+			public User(SoulNetwork network, SoulTicket ticket, PlayerEntity user)
+			{
+				super(network, ticket);
+
+				this.user = user;
+			}
+
+			public PlayerEntity getUser()
+			{
+				return user;
+			}
+		}
+	}
+
+	@Cancelable
+	public static class Fill extends SoulNetworkEvent
+	{
+
+		private int maximum;
+
+		public Fill(SoulNetwork network, SoulTicket ticket, int maximum)
+		{
+			super(network, ticket);
+
+			this.maximum = maximum;
+		}
+
+		public int getMaximum()
+		{
+			return maximum;
+		}
+
+		public void setMaximum(int maximum)
+		{
+			this.maximum = maximum;
+		}
+	}
+}