Swap the API packages

The new one is now built for the api jar and the old one is now internal.
It will slowly be moved around to sane places within the internal code. Most
of the features provided in the old "api" are addon specific features which
will generally rely on the main jar anyways. The new API will be specific
to compatibility features, such as blacklists, recipes, and value modification.
This commit is contained in:
Nicholas Ignoffo 2018-02-05 17:04:38 -08:00
parent 4fbcac6aa2
commit ddaadfbe52
421 changed files with 1006 additions and 999 deletions

View file

@ -93,6 +93,7 @@ task apiJar(type: Jar) {
from sourceSets.main.allSource
from sourceSets.main.output
include 'WayofTime/bloodmagic/api/**/*'
exclude 'WayofTime/bloodmagic/api/impl/**/*'
classifier = 'api'
}

View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic;
import WayofTime.bloodmagic.api.registry.OrbRegistry;
import WayofTime.bloodmagic.api.registry.RitualRegistry;
import WayofTime.bloodmagic.api.util.helper.LogHelper;
import WayofTime.bloodmagic.api_impl.BloodMagicAPI;
import WayofTime.bloodmagic.apiv2.BloodMagicPlugin;
import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin;
import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry;
import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.api.BloodMagicPlugin;
import WayofTime.bloodmagic.api.IBloodMagicPlugin;
import WayofTime.bloodmagic.client.gui.GuiHandler;
import WayofTime.bloodmagic.command.CommandBloodMagic;
import WayofTime.bloodmagic.core.RegistrarBloodMagic;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.fakePlayer.FakePlayerBM;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
import com.mojang.authlib.GameProfile;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting;
import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.iface.IAlchemyArray;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.iface.IAlchemyArray;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.iface.ISigil;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.iface.ISigil;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
import com.google.common.base.Predicate;
import net.minecraft.entity.EntityLiving;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.alchemyArray;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.iface.IAlchemyArray;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;

View file

@ -1,19 +1,18 @@
package WayofTime.bloodmagic.altar;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.altar.*;
import WayofTime.bloodmagic.api.event.AltarCraftedEvent;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api_impl.BloodMagicAPI;
import WayofTime.bloodmagic.apibutnotreally.BlockStack;
import WayofTime.bloodmagic.apibutnotreally.Constants;
import WayofTime.bloodmagic.apibutnotreally.altar.*;
import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent;
import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb;
import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb;
import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry;
import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe;
import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.block.BlockBloodRune;
import WayofTime.bloodmagic.block.BlockLifeEssence;
import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.Utils;
import com.google.common.base.Enums;
import com.google.common.base.Strings;
import net.minecraft.block.state.IBlockState;
@ -31,7 +30,6 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import java.util.List;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.apiv2;
package WayofTime.bloodmagic.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.apiv2;
package WayofTime.bloodmagic.api;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.ResourceLocation;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.apiv2;
package WayofTime.bloodmagic.api;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.apiv2;
package WayofTime.bloodmagic.api;
public interface IBloodMagicPlugin {

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api_impl;
package WayofTime.bloodmagic.api.impl;
import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
import WayofTime.bloodmagic.apiv2.IBloodMagicAPI;
import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent;
import WayofTime.bloodmagic.api.IBloodMagicAPI;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api_impl;
package WayofTime.bloodmagic.api.impl;
import WayofTime.bloodmagic.apiv2.IBloodMagicBlacklist;
import WayofTime.bloodmagic.api.IBloodMagicBlacklist;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import net.minecraft.block.Block;

View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.api_impl;
package WayofTime.bloodmagic.api.impl;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
import WayofTime.bloodmagic.apiv2.BloodMagicPlugin;
import WayofTime.bloodmagic.apiv2.IBloodMagicAPI;
import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin;
import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent;
import WayofTime.bloodmagic.api.BloodMagicPlugin;
import WayofTime.bloodmagic.api.IBloodMagicAPI;
import WayofTime.bloodmagic.api.IBloodMagicPlugin;
import WayofTime.bloodmagic.block.BlockBloodRune;
import WayofTime.bloodmagic.block.BlockDecorative;
import WayofTime.bloodmagic.block.enums.EnumBloodRune;

View file

@ -1,4 +1,4 @@
@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION)
@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|api", apiVersion = "2.0.0")
package WayofTime.bloodmagic.api;
import WayofTime.bloodmagic.BloodMagic;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api;
package WayofTime.bloodmagic.apibutnotreally;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api;
package WayofTime.bloodmagic.apibutnotreally;
import WayofTime.bloodmagic.api.util.helper.LogHelper;
import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper;
import net.minecraft.util.DamageSource;
/**

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api;
package WayofTime.bloodmagic.apibutnotreally;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.item.Item;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api;
package WayofTime.bloodmagic.apibutnotreally;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.entity.EntityLivingBase;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api;
package WayofTime.bloodmagic.apibutnotreally;
import net.minecraft.block.Block;
import net.minecraft.item.Item;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.alchemyCrafting;
package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
import WayofTime.bloodmagic.api.iface.IAlchemyArray;
import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.alchemyCrafting;
package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.alchemyCrafting;
package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
import net.minecraft.client.Minecraft;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
import net.minecraft.util.math.BlockPos;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
public class AltarUpgrade {
private int speedCount;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
import java.util.Locale;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
import net.minecraft.util.math.BlockPos;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
/**
* Any item that implements this interface will not be pulled into the Altar on

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.altar;
package WayofTime.bloodmagic.apibutnotreally.altar;
public interface IBloodAltar {
int getCapacity();

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.compress;
package WayofTime.bloodmagic.apibutnotreally.compress;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.compress;
package WayofTime.bloodmagic.apibutnotreally.compress;
import WayofTime.bloodmagic.util.Utils;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.eventhandler.Event;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -13,7 +13,7 @@ public class ItemBindEvent extends Event {
/**
* This event is called whenever a player attempts to bind a
* {@link WayofTime.bloodmagic.api.iface.IBindable} item.
* {@link WayofTime.bloodmagic.apibutnotreally.iface.IBindable} item.
*
* @param player The player doing the binding
* @param key The UUID of the player doing the binding

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone;
import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual;
import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone;
import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.common.eventhandler.Cancelable;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -24,7 +24,7 @@ public class SoulNetworkEvent extends Event {
/**
* This event is called when an
* {@link WayofTime.bloodmagic.api.impl.ItemBindable} is being drained
* {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable} is being drained
* inside of a {@link net.minecraft.tileentity.TileEntity}.
* <p>
* If canceled, the drain will not be executed.

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.event;
package WayofTime.bloodmagic.apibutnotreally.event;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.util.EnumFacing;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
/**
* Any item that implements this interface will not be pulled into the Altar on

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.apibutnotreally.BlockStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@ -16,7 +16,7 @@ public interface IHarvestHandler {
* the block types you want.
*
* @param world - The world the
* {@link WayofTime.bloodmagic.api.ritual.IMasterRitualStone} is in.
* {@link WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone} is in.
* @param pos - The position of the Block being checked
* @param blockStack - The Block being checked
* @return If the block was successfully harvested.

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.item.ItemStack;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
import net.minecraft.item.ItemStack;
public interface IMultiWillTool {

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
/**
* Held items that implement this will cause the beams between routing nodes to

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.item.ItemStack;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -8,7 +8,7 @@ import net.minecraft.world.World;
import javax.annotation.Nonnull;
/**
* Used for all {@link WayofTime.bloodmagic.api.impl.ItemSigil} <b>EXCEPT</b>
* Used for all {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil} <b>EXCEPT</b>
* Sigils of Holdings.
*/
public interface ISigil {

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.iface;
package WayofTime.bloodmagic.apibutnotreally.iface;
import net.minecraft.item.ItemStack;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.impl;
package WayofTime.bloodmagic.apibutnotreally.impl;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.IBindable;
import WayofTime.bloodmagic.apibutnotreally.Constants;
import WayofTime.bloodmagic.apibutnotreally.iface.IBindable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

View file

@ -1,8 +1,8 @@
package WayofTime.bloodmagic.api.impl;
package WayofTime.bloodmagic.apibutnotreally.impl;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.ISigil;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.apibutnotreally.Constants;
import WayofTime.bloodmagic.apibutnotreally.iface.ISigil;
import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.api.impl;
package WayofTime.bloodmagic.apibutnotreally.impl;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.IActivatable;
import WayofTime.bloodmagic.api.iface.ISigil;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.apibutnotreally.Constants;
import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable;
import WayofTime.bloodmagic.apibutnotreally.iface.ISigil;
import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper;
import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper;
import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
import com.google.common.base.Strings;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.incense;
package WayofTime.bloodmagic.apibutnotreally.incense;
public enum EnumTranquilityType {
PLANT(),

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.incense;
package WayofTime.bloodmagic.apibutnotreally.incense;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.incense;
package WayofTime.bloodmagic.apibutnotreally.incense;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.incense;
package WayofTime.bloodmagic.apibutnotreally.incense;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.incense;
package WayofTime.bloodmagic.apibutnotreally.incense;
public class TranquilityStack {
public final EnumTranquilityType type;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.livingArmour;
package WayofTime.bloodmagic.apibutnotreally.livingArmour;
import com.google.common.collect.Multimap;
import net.minecraft.entity.ai.attributes.AttributeModifier;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.livingArmour;
package WayofTime.bloodmagic.apibutnotreally.livingArmour;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
import net.minecraft.nbt.NBTTagCompound;
import java.lang.reflect.Constructor;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.livingArmour;
package WayofTime.bloodmagic.apibutnotreally.livingArmour;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.livingArmour;
package WayofTime.bloodmagic.apibutnotreally.livingArmour;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import net.minecraft.entity.player.EntityPlayer;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.orb;
package WayofTime.bloodmagic.apibutnotreally.orb;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraftforge.registries.IForgeRegistryEntry;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.orb;
package WayofTime.bloodmagic.apibutnotreally.orb;
import net.minecraft.item.ItemStack;

View file

@ -0,0 +1,6 @@
@Deprecated // This entire "api" is going to be nuked over time. Consider all of this unstable.
@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION)
package WayofTime.bloodmagic.apibutnotreally;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraftforge.fml.common.API;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.recipe;
package WayofTime.bloodmagic.apibutnotreally.recipe;
import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable;
import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.recipe;
package WayofTime.bloodmagic.apibutnotreally.recipe;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.recipe;
package WayofTime.bloodmagic.apibutnotreally.recipe;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.item.Item;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.recipe;
package WayofTime.bloodmagic.apibutnotreally.recipe;
import net.minecraft.block.Block;
import net.minecraft.item.Item;

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.ItemStackWrapper;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer;
import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting;
import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import net.minecraft.item.ItemStack;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe;
import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

View file

@ -1,8 +1,8 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ItemStackWrapper;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper;
import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import net.minecraft.item.ItemStack;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.iface.IHarvestHandler;
import WayofTime.bloodmagic.apibutnotreally.BlockStack;
import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStem;

View file

@ -1,8 +1,8 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import WayofTime.bloodmagic.apibutnotreally.BlockStack;
import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe;
import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier;
import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb;
import com.google.common.collect.ArrayListMultimap;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.registry;
package WayofTime.bloodmagic.apibutnotreally.registry;
import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.apibutnotreally.Constants;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
public enum EnumRitualReaderState {
SET_AREA,

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import net.minecraft.init.Items;
import net.minecraft.item.Item;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import WayofTime.bloodmagic.api.saving.SoulNetwork;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork;
import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import WayofTime.bloodmagic.api.soul.DemonWillHolder;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder;
import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -21,7 +21,7 @@ import java.util.Map.Entry;
/**
* Abstract class for creating new rituals. Rituals need be registered with
* {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)}
* {@link WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry#registerRitual(Ritual, String)}
*/
public abstract class Ritual {
public final ArrayList<RitualComponent> ritualComponents = new ArrayList<RitualComponent>();

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual;
package WayofTime.bloodmagic.apibutnotreally.ritual;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;

View file

@ -1,4 +1,4 @@
package WayofTime.bloodmagic.api.ritual.imperfect;
package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.math.BlockPos;

View file

@ -1,13 +1,13 @@
package WayofTime.bloodmagic.api.ritual.imperfect;
package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.apibutnotreally.BlockStack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
/**
* Abstract class for creating new imperfect rituals. ImperfectRituals need be
* registered with
* {@link WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)}
* {@link WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)}
*/
public abstract class ImperfectRitual {

View file

@ -1,6 +1,6 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package WayofTime.bloodmagic.api.ritual.imperfect;
package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect;
import mcp.MethodsReturnNonnullByDefault;

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.saving;
package WayofTime.bloodmagic.apibutnotreally.saving;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;

Some files were not shown because too many files have changed in this diff Show more