lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Creating a usable API (#1713)

Browse source 
* Initial stab at API structuring

* Throwing all the things into the API*
Eliminated all internal imports
Also added some helpful comments
*except for the ritual stuff

* Reducing the API
Threw back the altar/incense/unnecessary items to main
Added in a functional API instance

* API cleanup
Removing all the unnecessities
Smushed and vaporized some redundant recipe stuffs

* Made API dummy instances
Refactor packaging
This commit is contained in:
Arcaratus 2020-11-23 21:03:19 -05:00 committed by GitHub
parent 952b6aeeb0
commit 574d6a8e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
144 changed files with 558 additions and 990 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/wayoftime/bloodmagic/BloodMagic.java
View file

@ -55,7 +55,6 @@ import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.impl.BloodMagicCorePlugin;
import wayoftime.bloodmagic.network.BloodMagicPacketHandler;
import wayoftime.bloodmagic.potion.BloodMagicPotions;
import wayoftime.bloodmagic.registry.ModTranquilityHandlers;
import wayoftime.bloodmagic.ritual.RitualManager;
import wayoftime.bloodmagic.structures.ModDungeons;
import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber;
@ -133,7 +132,6 @@ public class BloodMagic
ModLoadingContext context = ModLoadingContext.get();
context.registerConfig(ModConfig.Type.CLIENT, ConfigManager.CLIENT_SPEC);
ModTranquilityHandlers.init();
ModDungeons.init();
}

5
src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java
View file

@ -12,7 +12,6 @@ import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import wayoftime.bloodmagic.api.tile.IAltarComponent;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.common.block.BlockBloodRune;
import wayoftime.bloodmagic.tile.TileAltar;
@ -35,10 +34,6 @@ public class AltarUtil
BlockPos componentPos = pos.add(component.getOffset());
BlockState worldState = world.getBlockState(componentPos);
if (worldState.getBlock() instanceof IAltarComponent)
if (((IAltarComponent) worldState.getBlock()).getType(world, worldState, componentPos) == component.getComponent())
continue;
if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR
&& !worldState.getMaterial().isLiquid())
continue;

10
src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java
View file

@ -20,13 +20,13 @@ import net.minecraftforge.fluids.capability.templates.FluidTank;
import net.minecraftforge.items.ItemHandlerHelper;
import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.block.enums.BloodRuneType;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.api.item.IBindable;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.orb.IBloodOrb;
import wayoftime.bloodmagic.common.item.IBindable;
import wayoftime.bloodmagic.common.item.BloodOrb;
import wayoftime.bloodmagic.common.item.IBloodOrb;
import wayoftime.bloodmagic.tile.TileAltar;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
@ -201,7 +201,7 @@ public class BloodAltar// implements IFluidHandler
RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(tileAltar.getWorld(), input);
if (recipe != null)
{
if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal())
if (recipe.getMinimumTier() <= altarTier.ordinal())
{
this.isActive = true;
this.recipe = recipe;

14
src/main/java/wayoftime/bloodmagic/altar/ComponentType.java
View file

@ -9,7 +9,6 @@ public enum ComponentType
{
GLOWSTONE, BLOODSTONE, BEACON, BLOODRUNE, CRYSTAL, NOTAIR;
public static final ComponentType[] VALUES = values();
private static final String BASE = "chat.bloodmagic.altar.comp.";
private String key;
@ -22,4 +21,17 @@ public enum ComponentType
{
return key;
}
public static ComponentType getType(String type)
{
for (ComponentType t : values())
{
if (t.name().equalsIgnoreCase(type))
{
return t;
}
}
return null;
}
}

12
src/main/java/wayoftime/bloodmagic/api/tile/IBloodAltar.java → src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java
View file

@ -1,14 +1,18 @@
package wayoftime.bloodmagic.api.tile;
import wayoftime.bloodmagic.altar.AltarTier;
package wayoftime.bloodmagic.altar;
/**
* Any Tile that implements this will be considered to be a Blood Altar
*/
public interface IBloodAltar
{
int getCapacity();
int getCurrentBlood();
AltarTier getTier();
/**
* @return - The actual human-readable tier (ordinal + 1) of the altar
*/
int getTier();
int getProgress();

6
src/main/java/wayoftime/bloodmagic/api/tile/IBloodRune.java → src/main/java/wayoftime/bloodmagic/altar/IBloodRune.java
View file

@ -1,4 +1,4 @@
package wayoftime.bloodmagic.api.tile;
package wayoftime.bloodmagic.altar;
import javax.annotation.Nullable;
@ -7,10 +7,10 @@ import net.minecraft.world.World;
import wayoftime.bloodmagic.block.enums.BloodRuneType;
/**
* Any block that implements this interface wil be considered as Blood Runes for the Blood Altar
* Any Block that implements this interface wil be considered as Blood Runes for the Blood Altar
*/
public interface IBloodRune
{
@Nullable
BloodRuneType getBloodRune(World world, BlockPos pos);
BloodRuneType getBloodRune(World world, BlockPos pos);
}

78
src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java
View file

@ -3,6 +3,11 @@ package wayoftime.bloodmagic.api;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.LazyValue;
import org.apache.logging.log4j.LogManager;
import java.util.function.Predicate;
/**
* The main interface between a plugin and Blood Magic's internals.
@ -11,12 +16,22 @@ import net.minecraft.block.BlockState;
* Magic. More advanced integration is out of the scope of this API and are
* considered "addons".
*
* To get an instance of this without actually creating an
* {@link IBloodMagicPlugin}, use {@link BloodMagicPlugin.Inject}.
* Use INSTANCE to get an instance of the API without actually implementing anything
*/
public interface IBloodMagicAPI
{
LazyValue<IBloodMagicAPI> INSTANCE = new LazyValue<>(() ->
{
try
{
return (IBloodMagicAPI) Class.forName("wayoftime.bloodmagic.impl.BloodMagicAPI").getDeclaredField("INSTANCE").get(null);
}
catch (ReflectiveOperationException e)
{
LogManager.getLogger().warn("Unable to find BloodMagicAPI, using a dummy instance instead...");
return new IBloodMagicAPI() {};
}
});
// /**
// * Retrieves the instance of the blacklist.
// *
@ -25,24 +40,19 @@ public interface IBloodMagicAPI
// @Nonnull
// IBloodMagicBlacklist getBlacklist();
/**
* Retrieves the instance of the recipe registrar.
*
* @return the active {@link IBloodMagicRecipeRegistrar} instance
*/
@Nonnull
IBloodMagicRecipeRegistrar getRecipeRegistrar();
/**
* Retrieves the instance of the value manager.
*
* @return the active {@link IBloodMagicValueManager} instance
*/
@Nonnull
IBloodMagicValueManager getValueManager();
default IBloodMagicValueManager getValueManager()
{
return new IBloodMagicValueManager() {};
}
/**
* Registers an {@link IBlockState} as a given component for the Blood Altar.
* Registers a {@link BlockState} as a given component for the Blood Altar.
* <p>
* Valid component types:
* <ul>
@ -57,10 +67,10 @@ public interface IBloodMagicAPI
* @param state The state to register
* @param componentType The type of Blood Altar component to register as.
*/
void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType);
default void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) {}
/**
* Removes an {@link IBlockState} from the component mappings
* Removes a {@link BlockState} from the component mappings
* <p>
* Valid component types:
* <ul>
@ -75,6 +85,42 @@ public interface IBloodMagicAPI
* @param state The state to unregister
* @param componentType The type of Blood Altar component to unregister from.
*/
void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType);
default void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) {}
/**
* Registers a {@link Predicate<BlockState>} for tranquility handling
* <p>
* Valid tranquility types:
* <ul>
* <li>PLANT</li>
* <li>CROP</li>
* <li>TREE</li>
* <li>EARTHEN</li>
* <li>WATER</li>
* <li>FIRE</li>
* <li>LAVA</li>
* </ul>
*
* @param predicate Predicate to be used for the handler (goes to ITranquilityHandler)
* @param tranquilityType Tranquility type that the handler holds
* @param value The amount of tranquility that the handler has
*/
default void registerTranquilityHandler(Predicate<BlockState> predicate, String tranquilityType, double value) {}
/**
* Gets the total Will that a Player contains
* <p>
* Valid tranquility types:
* <ul>
* <li>DEFAULT</li>
* <li>CORROSIVE</li>
* <li>DESTRUCTIVE</li>
* <li>VENGEFUL</li>
* <li>STEADFAST</li>
* </ul>
*/
default double getTotalDemonWill(String willType, PlayerEntity player)
{
return 0;
}
}

100
src/main/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java
View file

@ -1,100 +0,0 @@
package wayoftime.bloodmagic.api;
/**
* Allows recipe addition and removal.
*/
public interface IBloodMagicRecipeRegistrar
{
// /**
// * Adds a new recipe to the Blood Altar.
// *
// * @param input An input {@link Ingredient}.
// * @param output An output {@link ItemStack}.
// * @param minimumTier The minimum Blood Altar tier required for this recipe.
// * @param syphon The amount of Life Essence to syphon from the Blood Altar
// * over the course of the craft.
// * @param consumeRate How quickly the Life Essence is syphoned.
// * @param drainRate How quickly progress is lost if the Blood Altar runs out
// * of Life Essence during the craft.
// */
// void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier,
// @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate);
//
// /**
// * Removes a Blood Altar recipe based on an input {@link ItemStack}.
// *
// * @param input The input item to remove the recipe of.
// * @return Whether or not a recipe was removed.
// */
// boolean removeBloodAltar(@Nonnull ItemStack input);
//
// /**
// * Adds a new recipe to the Alchemy Table.
// *
// * @param output An output {@link ItemStack}.
// * @param syphon The amount of Life Essence to syphon from the Blood Orb's
// * bound network over the course of the craft.
// * @param ticks The amount of ticks it takes to complete the craft.
// * @param minimumTier The minimum Blood Orb tier required for this recipe.
// * @param input An array of {@link Ingredient}s to accept as inputs.
// */
// void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks,
// @Nonnegative int minimumTier, @Nonnull Ingredient... input);
//
// /**
// * Removes an Alchemy Table recipe based on an input {@link ItemStack} array.
// *
// * @param input The input items to remove the recipe of.
// * @return Whether or not a recipe was removed.
// */
// boolean removeAlchemyTable(@Nonnull ItemStack... input);
//
// /**
// * Adds a new recipe to the Soul/Tartaric Forge.
// *
// * @param output An output {@link ItemStack}.
// * @param minimumSouls The minimum number of souls that must be contained in the
// * Soul Gem.
// * @param soulDrain The number of souls to drain from the Soul Gem.
// * @param input An array of {@link Ingredient}s to accept as inputs.
// */
// void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain,
// @Nonnull Ingredient... input);
//
// /**
// * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack}
// * array.
// *
// * @param input The input items to remove the recipe of.
// * @return Whether or not a recipe was removed.
// */
// boolean removeTartaricForge(@Nonnull ItemStack... input);
//
// /**
// * Adds a new recipe to the Alchemy Array.
// *
// * @param input An input {@link Ingredient}. First item put into the
// * Alchemy Array.
// * @param catalyst A catalyst {@link Ingredient}. Second item put into the
// * Alchemy Array.
// * @param output An output {@link ItemStack}.
// * @param circleTexture The texture to render for the Alchemy Array circle.
// */
// void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output,
// @Nullable ResourceLocation circleTexture);
//
// /**
// * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's
// * catalyst {@link ItemStack}.
// *
// * @param input The input item to remove the recipe of.
// * @param catalyst The catalyst item to remove the recipe of.
// * @return Whether or not a recipe was removed.
// */
// boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst);
//
// void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input);
//
// boolean removeSacrificeCraft(@Nonnull ItemStack... input);
}

8
src/main/java/wayoftime/bloodmagic/api/IBloodMagicValueManager.java
View file

@ -21,10 +21,10 @@ public interface IBloodMagicValueManager
* @param entityId The registry name of the entity.
* @param value The amount of LP per health point to receive upon sacrifice.
*/
void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value);
default void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value) {}
/**
* Sets the Tranquility value of a given {@link IBlockState}.
* Sets the Tranquility value of a given {@link BlockState}.
* <p>
* Valid tranquility types:
* <ul>
@ -37,9 +37,9 @@ public interface IBloodMagicValueManager
* <li>LAVA</li>
* </ul>
*
* @param state The {@link IBlockState} to set the value of.
* @param state The {@link BlockState} to set the value of.
* @param tranquilityType The type of Tranquility this block should provide.
* @param value The amount of tranquility this block should provide.
*/
void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value);
default void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value) {}
}

46
src/main/java/wayoftime/bloodmagic/api/compat/EnumDemonWillType.java Normal file
View file

@ -0,0 +1,46 @@
package wayoftime.bloodmagic.api.compat;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum EnumDemonWillType implements IStringSerializable
{
DEFAULT("default"),
CORROSIVE("corrosive"),
DESTRUCTIVE("destructive"),
VENGEFUL("vengeful"),
STEADFAST("steadfast");
public final String name;
EnumDemonWillType(String name)
{
this.name = name;
}
@Override
public String toString()
{
return name().toLowerCase(Locale.ENGLISH);
}
@Override
public String getString()
{
return this.toString();
}
public static EnumDemonWillType getType(String type)
{
for (EnumDemonWillType t : values())
{
if (t.name().equalsIgnoreCase(type))
{
return t;
}
}
return null;
}
}

2
src/main/java/wayoftime/bloodmagic/api/item/IAltarReader.java → src/main/java/wayoftime/bloodmagic/api/compat/IAltarReader.java
View file

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

2
src/main/java/wayoftime/bloodmagic/api/item/ICustomAlchemyConsumable.java → src/main/java/wayoftime/bloodmagic/api/compat/ICustomAlchemyConsumable.java
View file

@ -1,4 +1,4 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.item.ItemStack;

6
src/main/java/wayoftime/bloodmagic/will/IDemonWill.java → src/main/java/wayoftime/bloodmagic/api/compat/IDemonWill.java
View file

@ -1,7 +1,10 @@
package wayoftime.bloodmagic.will;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.item.ItemStack;
/**
* Interface for Items that contain Will
*/
public interface IDemonWill
{
/**
@ -35,7 +38,6 @@ public interface IDemonWill
* Creates a new ItemStack with the specified number of will. Implementation
* should respect the number requested.
*
* @param meta - The meta of the ItemStack to create
* @param number - The amount of Will to create the Stack with.
* @return - An ItemStack with the set amount of Will
*/

4
src/main/java/wayoftime/bloodmagic/will/IDemonWillConduit.java → src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillConduit.java
View file

@ -1,7 +1,7 @@
package wayoftime.bloodmagic.will;
package wayoftime.bloodmagic.api.compat;
/**
* Implement this interface on a block that can accept and store Demonic Will.
* Implement this interface on a Block that can accept and store Demonic Will.
*/
public interface IDemonWillConduit
{

5
src/main/java/wayoftime/bloodmagic/will/IDemonWillGem.java → src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillGem.java
View file

@ -1,7 +1,10 @@
package wayoftime.bloodmagic.will;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.item.ItemStack;
/**
* Interface for Items that store Will
*/
public interface IDemonWillGem
{
/**

5
src/main/java/wayoftime/bloodmagic/api/item/IDemonWillViewer.java → src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillViewer.java
View file

@ -1,9 +1,12 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/**
* Interface for Items that allow players to see Will inside of chunks
*/
public interface IDemonWillViewer
{
boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player);

5
src/main/java/wayoftime/bloodmagic/will/IDemonWillWeapon.java → src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillWeapon.java
View file

@ -1,10 +1,13 @@
package wayoftime.bloodmagic.will;
package wayoftime.bloodmagic.api.compat;
import java.util.List;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
/**
* Interface for weapons that drop will when a LivingEntity is killed
*/
public interface IDemonWillWeapon
{
List<ItemStack> getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting);

5
src/main/java/wayoftime/bloodmagic/will/IDiscreteDemonWill.java → src/main/java/wayoftime/bloodmagic/api/compat/IDiscreteDemonWill.java
View file

@ -1,7 +1,10 @@
package wayoftime.bloodmagic.will;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.item.ItemStack;
/**
* Interface for Items that contain a discrete amount of Will
*/
public interface IDiscreteDemonWill
{
/**

5
src/main/java/wayoftime/bloodmagic/incense/IIncensePath.java → src/main/java/wayoftime/bloodmagic/api/compat/IIncensePath.java
View file

@ -1,9 +1,12 @@
package wayoftime.bloodmagic.incense;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**
* Any Block that implements this will be considered to be a valid path block for the Incense Altar
*/
public interface IIncensePath
{
/**

6
src/main/java/wayoftime/bloodmagic/api/item/IMultiWillTool.java → src/main/java/wayoftime/bloodmagic/api/compat/IMultiWillTool.java
View file

@ -1,8 +1,10 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.api.compat;
import net.minecraft.item.ItemStack;
import wayoftime.bloodmagic.will.EnumDemonWillType;
/**
* Interface for Items that can contain multiple Will types
*/
public interface IMultiWillTool
{
EnumDemonWillType getCurrentType(ItemStack stack);

14
src/main/java/wayoftime/bloodmagic/api/tile/IAltarComponent.java
View file

@ -1,14 +0,0 @@
package wayoftime.bloodmagic.api.tile;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import wayoftime.bloodmagic.altar.ComponentType;
public interface IAltarComponent
{
@Nullable
ComponentType getType(World world, BlockState state, BlockPos pos);
}

11
src/main/java/wayoftime/bloodmagic/block/enums/BloodRuneType.java
View file

@ -6,7 +6,16 @@ import net.minecraft.util.IStringSerializable;
public enum BloodRuneType implements IStringSerializable
{
BLANK, SPEED, EFFICIENCY, SACRIFICE, SELF_SACRIFICE, DISPLACEMENT, CAPACITY, AUGMENTED_CAPACITY, ORB, ACCELERATION,
BLANK,
SPEED,
EFFICIENCY,
SACRIFICE,
SELF_SACRIFICE,
DISPLACEMENT,
CAPACITY,
AUGMENTED_CAPACITY,
ORB,
ACCELERATION,
CHARGING;
@Override

2
src/main/java/wayoftime/bloodmagic/client/ClientEvents.java
View file

@ -19,7 +19,6 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.item.IMultiWillTool;
import wayoftime.bloodmagic.client.model.MimicColor;
import wayoftime.bloodmagic.client.render.block.RenderAlchemyArray;
import wayoftime.bloodmagic.client.render.block.RenderAltar;
@ -35,6 +34,7 @@ import wayoftime.bloodmagic.common.item.ItemSacrificialDagger;
import wayoftime.bloodmagic.common.item.sigil.ItemSigilToggleable;
import wayoftime.bloodmagic.common.item.soul.ItemSentientSword;
import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
import wayoftime.bloodmagic.tile.TileAltar;
import wayoftime.bloodmagic.tile.TileDemonCrucible;

4
src/main/java/wayoftime/bloodmagic/client/hud/Elements.java
View file

@ -31,7 +31,7 @@ public class Elements
// Current tier
information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), altar -> altar == null
? "IV"
: NumeralHelper.toRoman(altar.getTier().toInt())));
: NumeralHelper.toRoman(altar.getTier())));
// Stored/Capacity
information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), altar -> String.format("%d/%d", altar == null
? 0
@ -47,7 +47,7 @@ public class Elements
// Current tier
information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), altar -> altar == null
? "IV"
: NumeralHelper.toRoman(altar.getTier().toInt())));
: NumeralHelper.toRoman(altar.getTier())));
// Stored/Capacity
information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), altar -> String.format("%d/%d", altar == null
? 0

2
src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDemonAura.java
View file

@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.util.Utils;
import wayoftime.bloodmagic.util.handler.event.ClientHandler;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class ElementDemonAura extends HUDElement
{

2
src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java
View file

@ -16,7 +16,7 @@ import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
import wayoftime.bloodmagic.api.item.IAltarReader;
import wayoftime.bloodmagic.api.compat.IAltarReader;
import wayoftime.bloodmagic.tile.TileAltar;
import wayoftime.bloodmagic.util.Utils;

2
src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java
View file

@ -16,7 +16,7 @@ import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
import wayoftime.bloodmagic.block.enums.BloodRuneType;
import wayoftime.bloodmagic.api.tile.IBloodRune;
import wayoftime.bloodmagic.altar.IBloodRune;
public class BlockBloodRune extends Block implements IBloodRune
{

4
src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrucible.java
View file

@ -18,8 +18,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
import wayoftime.bloodmagic.tile.TileDemonCrucible;
import wayoftime.bloodmagic.util.Utils;
import wayoftime.bloodmagic.will.IDemonWillGem;
import wayoftime.bloodmagic.will.IDiscreteDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillGem;
import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill;
public class BlockDemonCrucible extends Block
{

33
src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystal.java
View file

@ -29,9 +29,10 @@ import net.minecraft.world.IWorld;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.common.item.ItemDemonCrystal;
import wayoftime.bloodmagic.tile.TileDemonCrystal;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class BlockDemonCrystal extends Block
@ -95,21 +96,21 @@ public class BlockDemonCrystal extends Block
ItemStack stack = ItemStack.EMPTY;
switch (type)
{
case CORROSIVE:
stack = EnumDemonWillType.CORROSIVE.getStack();
break;
case DEFAULT:
stack = EnumDemonWillType.DEFAULT.getStack();
break;
case DESTRUCTIVE:
stack = EnumDemonWillType.DESTRUCTIVE.getStack();
break;
case STEADFAST:
stack = EnumDemonWillType.STEADFAST.getStack();
break;
case VENGEFUL:
stack = EnumDemonWillType.VENGEFUL.getStack();
break;
case CORROSIVE:
stack = new ItemStack(BloodMagicItems.CORROSIVE_CRYSTAL.get());
break;
case DEFAULT:
stack = new ItemStack(BloodMagicItems.RAW_CRYSTAL.get());
break;
case DESTRUCTIVE:
stack = new ItemStack(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get());
break;
case STEADFAST:
stack = new ItemStack(BloodMagicItems.STEADFAST_CRYSTAL.get());
break;
case VENGEFUL:
stack = new ItemStack(BloodMagicItems.VENGEFUL_CRYSTAL.get());
break;
}
stack.setCount(crystalNumber);

2
src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java
View file

@ -20,7 +20,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.item.ItemActivationCrystal;
import wayoftime.bloodmagic.api.item.IBindable;
import wayoftime.bloodmagic.common.item.IBindable;
import wayoftime.bloodmagic.ritual.Ritual;
import wayoftime.bloodmagic.tile.TileMasterRitualStone;
import wayoftime.bloodmagic.util.helper.RitualHelper;

2
src/main/java/wayoftime/bloodmagic/common/block/BlockPath.java
View file

@ -4,7 +4,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import wayoftime.bloodmagic.incense.IIncensePath;
import wayoftime.bloodmagic.api.compat.IIncensePath;
public class BlockPath extends Block implements IIncensePath
{

2
src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java
View file

@ -36,7 +36,7 @@ import wayoftime.bloodmagic.ritual.EnumRuneType;
import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber;
import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable;
import wayoftime.bloodmagic.tile.container.ContainerSoulForge;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class BloodMagicBlocks
{

2
src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java
View file

@ -11,7 +11,7 @@ import net.minecraftforge.fml.RegistryObject;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class GeneratorItemModels extends ItemModelProvider
{

6
src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java
View file

@ -14,9 +14,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
import wayoftime.bloodmagic.api.recipe.RecipeARC;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient;
import wayoftime.bloodmagic.recipe.RecipeARC;
import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
import wayoftime.bloodmagic.util.Constants;

2
src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java
View file

@ -7,7 +7,7 @@ import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
import wayoftime.bloodmagic.util.Constants;

4
src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java
View file

@ -12,8 +12,8 @@ import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
import wayoftime.bloodmagic.util.Constants;

2
src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java
View file

@ -7,7 +7,7 @@ import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
import wayoftime.bloodmagic.util.Constants;

2
src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java
View file

@ -10,7 +10,7 @@ import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
import wayoftime.bloodmagic.util.Constants;

3
src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java
View file

@ -30,10 +30,9 @@ import wayoftime.bloodmagic.common.item.soul.ItemSoulGem;
import wayoftime.bloodmagic.common.item.soul.ItemSoulSnare;
import wayoftime.bloodmagic.common.registration.impl.BloodOrbDeferredRegister;
import wayoftime.bloodmagic.common.registration.impl.BloodOrbRegistryObject;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.ritual.EnumRuneType;
import wayoftime.bloodmagic.structures.ItemDungeonTester;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class BloodMagicItems
{

8
src/main/java/wayoftime/bloodmagic/orb/BloodOrb.java → src/main/java/wayoftime/bloodmagic/common/item/BloodOrb.java
View file

@ -1,12 +1,12 @@
package wayoftime.bloodmagic.orb;
package wayoftime.bloodmagic.common.item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistryEntry;
/**
* Refactoring of the original BloodOrb. BloodOrbs are no longer registered due
* to The Flattening.
* Base Blood Orb class object for blood orbs
*/
public class BloodOrb extends net.minecraftforge.registries.ForgeRegistryEntry<BloodOrb>
public final class BloodOrb extends ForgeRegistryEntry<BloodOrb>
{
private final ResourceLocation name;
private final int tier;

4
src/main/java/wayoftime/bloodmagic/api/item/IActivatable.java → src/main/java/wayoftime/bloodmagic/common/item/IActivatable.java
View file

@ -1,4 +1,4 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.common.item;
import javax.annotation.Nonnull;
@ -7,7 +7,7 @@ import net.minecraft.nbt.CompoundNBT;
import wayoftime.bloodmagic.util.Constants;
/**
* Interface for activatable items
* Interface for activatable Items
*/
public interface IActivatable
{

2
src/main/java/wayoftime/bloodmagic/api/item/IBindable.java → src/main/java/wayoftime/bloodmagic/common/item/IBindable.java
View file

@ -1,4 +1,4 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.common.item;
import javax.annotation.Nullable;

15
src/main/java/wayoftime/bloodmagic/common/item/IBloodOrb.java Normal file
View file

@ -0,0 +1,15 @@
package wayoftime.bloodmagic.common.item;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
/**
* Interface for any items that are Blood Orbs
* TODO: Should either merge this implementation with BloodOrb or clean it up idk
*/
public interface IBloodOrb
{
@Nullable
BloodOrb getOrb(ItemStack stack);
}

1
src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java
View file

@ -14,7 +14,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.api.item.IBindable;
public class ItemActivationCrystal extends Item implements IBindable
{

1
src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java
View file

@ -12,7 +12,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.api.item.IBindable;
public class ItemBindableBase extends Item implements IBindable
{

2
src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java
View file

@ -21,8 +21,6 @@ import net.minecraftforge.common.extensions.IForgeItem;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.core.data.SoulNetwork;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.orb.IBloodOrb;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
import wayoftime.bloodmagic.util.helper.PlayerHelper;

4
src/main/java/wayoftime/bloodmagic/common/item/ItemDemonCrystal.java
View file

@ -3,8 +3,8 @@ package wayoftime.bloodmagic.common.item;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDiscreteDemonWill;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill;
public class ItemDemonCrystal extends Item implements IDiscreteDemonWill
{

2
src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.item.IDemonWillViewer;
import wayoftime.bloodmagic.api.compat.IDemonWillViewer;
import wayoftime.bloodmagic.util.handler.event.GenericHandler;
public class ItemDemonWillGauge extends Item implements IDemonWillViewer

2
src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java
View file

@ -45,7 +45,7 @@ import wayoftime.bloodmagic.util.Utils;
import wayoftime.bloodmagic.util.handler.event.ClientHandler;
import wayoftime.bloodmagic.util.helper.RitualHelper;
import wayoftime.bloodmagic.util.helper.TextHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class ItemRitualDiviner extends Item
{

4
src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java
View file

@ -38,8 +38,8 @@ import wayoftime.bloodmagic.util.handler.event.ClientHandler;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.util.helper.TextHelper;
import wayoftime.bloodmagic.will.DemonWillHolder;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDiscreteDemonWill;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill;
public class ItemRitualReader extends Item
{

3
src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java
View file

@ -11,8 +11,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.api.item.IBindable;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.common.item.sigil.ISigil;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;

5
src/main/java/wayoftime/bloodmagic/api/item/IARCTool.java → src/main/java/wayoftime/bloodmagic/common/item/arc/IARCTool.java
View file

@ -1,7 +1,10 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.common.item.arc;
import net.minecraft.item.ItemStack;
/**
* Interface for items that affect ARC operation
*/
public interface IARCTool
{
default double getCraftingSpeedMultiplier(ItemStack stack)

1
src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java
View file

@ -11,7 +11,6 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.item.IARCTool;
import wayoftime.bloodmagic.util.ChatUtil;
public class ItemARCToolBase extends Item implements IARCTool

6
src/main/java/wayoftime/bloodmagic/api/item/ISigil.java → src/main/java/wayoftime/bloodmagic/common/item/sigil/ISigil.java
View file

@ -1,4 +1,4 @@
package wayoftime.bloodmagic.api.item;
package wayoftime.bloodmagic.common.item.sigil;
import javax.annotation.Nonnull;
@ -6,14 +6,12 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import wayoftime.bloodmagic.common.item.ItemSigil;
/**
* Used for all {@link ItemSigil} <b>EXCEPT</b> Sigils of Holdings.
* Used for all ItemSigils <b>EXCEPT</b> for Sigils of Holding.
*/
public interface ISigil
{
default boolean performArrayEffect(World world, BlockPos pos)
{
return false;

1
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java
View file

@ -9,7 +9,6 @@ import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
import wayoftime.bloodmagic.util.helper.PlayerHelper;

1
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java
View file

@ -14,7 +14,6 @@ import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.core.data.SoulNetwork;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.entity.projectile.EntityBloodLight;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.util.helper.NetworkHelper;

7
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java
View file

@ -16,10 +16,9 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.World;
import wayoftime.bloodmagic.api.tile.IBloodAltar;
import wayoftime.bloodmagic.altar.IBloodAltar;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.api.item.IAltarReader;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.api.compat.IAltarReader;
import wayoftime.bloodmagic.tile.TileIncenseAltar;
import wayoftime.bloodmagic.util.ChatUtil;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
@ -72,7 +71,7 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
if (tile != null && tile instanceof IBloodAltar)
{
IBloodAltar altar = (IBloodAltar) tile;
int tier = altar.getTier().ordinal() + 1;
int tier = altar.getTier();
int currentEssence = altar.getCurrentBlood();
int capacity = altar.getCapacity();
altar.checkTier();

1
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java
View file

@ -14,7 +14,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
import wayoftime.bloodmagic.util.helper.PlayerHelper;

3
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java
View file

@ -14,8 +14,7 @@ import net.minecraft.world.World;
import wayoftime.bloodmagic.common.item.ItemSigil;
import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.api.item.IActivatable;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.common.item.IActivatable;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.util.helper.NetworkHelper;

1
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java
View file

@ -15,7 +15,6 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
import wayoftime.bloodmagic.util.helper.PlayerHelper;

1
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java
View file

@ -16,7 +16,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.api.item.ISigil;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
import wayoftime.bloodmagic.util.helper.PlayerHelper;

4
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java
View file

@ -17,8 +17,8 @@ import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.util.ChatUtil;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill;
public class ItemMonsterSoul extends Item implements IDemonWill
{

8
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java
View file

@ -36,12 +36,12 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.item.BMItemTier;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.api.item.IMultiWillTool;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.will.IDemonWillWeapon;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillWeapon;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMultiWillTool

8
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java
View file

@ -36,12 +36,12 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.item.BMItemTier;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.api.item.IMultiWillTool;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.will.IDemonWillWeapon;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillWeapon;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon, IMultiWillTool

8
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java
View file

@ -36,12 +36,12 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.item.BMItemTier;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.api.item.IMultiWillTool;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.will.IDemonWillWeapon;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillWeapon;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, IMultiWillTool

8
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java
View file

@ -35,12 +35,12 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.item.BMItemTier;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.api.item.IMultiWillTool;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.will.IDemonWillWeapon;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillWeapon;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMultiWillTool

8
src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java
View file

@ -20,13 +20,13 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.item.IMultiWillTool;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.util.ChatUtil;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NBTHelper;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.will.IDemonWill;
import wayoftime.bloodmagic.will.IDemonWillGem;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillGem;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class ItemSoulGem extends Item implements IDemonWillGem, IMultiWillTool

2
src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java
View file

@ -16,7 +16,7 @@ import net.minecraftforge.common.crafting.conditions.NotCondition;
import net.minecraftforge.common.crafting.conditions.TagEmptyCondition;
import net.minecraftforge.fluids.FluidStack;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient;
import wayoftime.bloodmagic.common.data.recipe.builder.ARCRecipeBuilder;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.common.tags.BloodMagicTags;

10
src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java
View file

@ -1,11 +1,11 @@
package wayoftime.bloodmagic.common.recipe;
import net.minecraft.item.crafting.IRecipeType;
import wayoftime.bloodmagic.api.recipe.RecipeARC;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.recipe.RecipeARC;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
public class BloodMagicRecipeType
{

6
src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java
View file

@ -21,9 +21,9 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.registries.ForgeRegistryEntry;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
import wayoftime.bloodmagic.api.recipe.RecipeARC;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient;
import wayoftime.bloodmagic.recipe.RecipeARC;
import wayoftime.bloodmagic.util.Constants;
public class ARCRecipeSerializer<RECIPE extends RecipeARC> extends ForgeRegistryEntry<IRecipeSerializer<?>>

4
src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java
View file

@ -12,8 +12,8 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistryEntry;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.util.Constants;
public class AlchemyArrayRecipeSerializer<RECIPE extends RecipeAlchemyArray>

4
src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java
View file

@ -16,8 +16,8 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistryEntry;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.util.Constants;
public class AlchemyTableRecipeSerializer<RECIPE extends RecipeAlchemyTable>

4
src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java
View file

@ -12,8 +12,8 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistryEntry;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.util.Constants;
public class BloodAltarRecipeSerializer<RECIPE extends RecipeBloodAltar>

4
src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java
View file

@ -15,8 +15,8 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistryEntry;
import wayoftime.bloodmagic.api.SerializerHelper;
import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.recipe.helper.SerializerHelper;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.util.Constants;
public class TartaricForgeRecipeSerializer<RECIPE extends RecipeTartaricForge>

2
src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java
View file

@ -4,7 +4,7 @@ import java.util.function.Supplier;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.common.item.BloodOrb;
public class BloodOrbDeferredRegister extends WrappedDeferredRegister<BloodOrb>
{

2
src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java
View file

@ -2,7 +2,7 @@ package wayoftime.bloodmagic.common.registration.impl;
import net.minecraftforge.fml.RegistryObject;
import wayoftime.bloodmagic.common.registration.WrappedRegistryObject;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.common.item.BloodOrb;
public class BloodOrbRegistryObject<ORB extends BloodOrb> extends WrappedRegistryObject<ORB>
{

2
src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java
View file

@ -5,7 +5,7 @@ import javax.annotation.Nonnull;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraftforge.fml.RegistryObject;
import wayoftime.bloodmagic.api.providers.IEntityTypeProvider;
import wayoftime.bloodmagic.util.providers.IEntityTypeProvider;
import wayoftime.bloodmagic.common.registration.WrappedRegistryObject;
public class EntityTypeRegistryObject<ENTITY extends Entity> extends WrappedRegistryObject<EntityType<ENTITY>>

25
src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java
View file

@ -1,11 +1,11 @@
package wayoftime.bloodmagic.common.registries;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.recipe.RecipeARC;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.recipe.RecipeARC;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.common.recipe.serializer.ARCRecipeSerializer;
import wayoftime.bloodmagic.common.recipe.serializer.AlchemyArrayRecipeSerializer;
import wayoftime.bloodmagic.common.recipe.serializer.AlchemyTableRecipeSerializer;
@ -13,11 +13,6 @@ import wayoftime.bloodmagic.common.recipe.serializer.BloodAltarRecipeSerializer;
import wayoftime.bloodmagic.common.recipe.serializer.TartaricForgeRecipeSerializer;
import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerDeferredRegister;
import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerRegistryObject;
import wayoftime.bloodmagic.recipe.IRecipeARC;
import wayoftime.bloodmagic.recipe.IRecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.IRecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.IRecipeBloodAltar;
import wayoftime.bloodmagic.recipe.IRecipeTartaricForge;
public class BloodMagicRecipeSerializers
{
@ -28,11 +23,11 @@ public class BloodMagicRecipeSerializers
public static final IRecipeSerializerDeferredRegister RECIPE_SERIALIZERS = new IRecipeSerializerDeferredRegister(BloodMagic.MODID);
public static final IRecipeSerializerRegistryObject<RecipeBloodAltar> ALTAR = RECIPE_SERIALIZERS.register("altar", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new));
public static final IRecipeSerializerRegistryObject<RecipeAlchemyArray> ARRAY = RECIPE_SERIALIZERS.register("array", () -> new AlchemyArrayRecipeSerializer<>(IRecipeAlchemyArray::new));
public static final IRecipeSerializerRegistryObject<RecipeTartaricForge> TARTARIC = RECIPE_SERIALIZERS.register("soulforge", () -> new TartaricForgeRecipeSerializer<>(IRecipeTartaricForge::new));
public static final IRecipeSerializerRegistryObject<RecipeARC> ARC = RECIPE_SERIALIZERS.register("arc", () -> new ARCRecipeSerializer<>(IRecipeARC::new));
public static final IRecipeSerializerRegistryObject<RecipeAlchemyTable> ALCHEMYTABLE = RECIPE_SERIALIZERS.register("alchemytable", () -> new AlchemyTableRecipeSerializer<>(IRecipeAlchemyTable::new));
public static final IRecipeSerializerRegistryObject<RecipeBloodAltar> ALTAR = RECIPE_SERIALIZERS.register("altar", () -> new BloodAltarRecipeSerializer<>(RecipeBloodAltar::new));
public static final IRecipeSerializerRegistryObject<RecipeAlchemyArray> ARRAY = RECIPE_SERIALIZERS.register("array", () -> new AlchemyArrayRecipeSerializer<>(RecipeAlchemyArray::new));
public static final IRecipeSerializerRegistryObject<RecipeTartaricForge> TARTARIC = RECIPE_SERIALIZERS.register("soulforge", () -> new TartaricForgeRecipeSerializer<>(RecipeTartaricForge::new));
public static final IRecipeSerializerRegistryObject<RecipeARC> ARC = RECIPE_SERIALIZERS.register("arc", () -> new ARCRecipeSerializer<>(RecipeARC::new));
public static final IRecipeSerializerRegistryObject<RecipeAlchemyTable> ALCHEMYTABLE = RECIPE_SERIALIZERS.register("alchemytable", () -> new AlchemyTableRecipeSerializer<>(RecipeAlchemyTable::new));
// public static final DeferredRegister<IRecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, BloodMagic.MODID);

2
src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java
View file

@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.core.registry.OrbRegistry;
import wayoftime.bloodmagic.util.Constants;

4
src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java
View file

@ -22,7 +22,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.util.ChatUtil;
import wayoftime.bloodmagic.util.Constants;
@ -119,7 +119,7 @@ public class BloodAltarRecipeCategory implements IRecipeCategory<RecipeBloodAlta
{
Minecraft mc = Minecraft.getInstance();
String[] infoString = new String[]
{ TextHelper.localize("jei.bloodmagic.recipe.requiredtier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())),
{ TextHelper.localize("jei.bloodmagic.recipe.requiredtier", NumeralHelper.toRoman(recipe.getMinimumTier() + 1)),
TextHelper.localize("jei.bloodmagic.recipe.requiredlp", recipe.getSyphon()) };
mc.fontRenderer.drawString(matrixStack, infoString[0], 90
- mc.fontRenderer.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB());

2
src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java
View file

@ -22,7 +22,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.fluids.FluidStack;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.recipe.RecipeARC;
import wayoftime.bloodmagic.recipe.RecipeARC;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.handler.event.ClientHandler;

2
src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java
View file

@ -13,7 +13,7 @@ import mezz.jei.api.recipe.category.IRecipeCategory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.TextHelper;

2
src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java
View file

@ -20,7 +20,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.common.item.BloodMagicItems;
import wayoftime.bloodmagic.util.ChatUtil;

5
src/main/java/wayoftime/bloodmagic/core/data/SoulTicket.java
View file

@ -8,9 +8,12 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
/**
* Wrapper for any interactions with the SoulNetwork
* Contains a description on what the interaction is and any extra data
*/
public class SoulTicket
{
private static final ITextComponent EMPTY = new StringTextComponent("");
private final ITextComponent description;

2
src/main/java/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java
View file

@ -14,7 +14,7 @@ import net.minecraftforge.common.crafting.IIngredientSerializer;
import net.minecraftforge.common.crafting.VanillaIngredientSerializer;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.core.registry.OrbRegistry;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.common.item.BloodOrb;
public class IngredientBloodOrb extends Ingredient
{

2
src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java
View file

@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting;

2
src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java
View file

@ -11,7 +11,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer;
public class AlchemyArrayRendererRegistry

2
src/main/java/wayoftime/bloodmagic/core/registry/OrbRegistry.java
View file

@ -10,7 +10,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.registries.ForgeRegistries;
import wayoftime.bloodmagic.altar.AltarTier;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.common.item.BloodOrb;
/**
* This is only for those who wish to add a basic {@link BloodOrb}. If you need

2
src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunk;
import wayoftime.bloodmagic.util.BMLog;
import wayoftime.bloodmagic.will.DemonWillHolder;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class WorldDemonWillHandler
{

2
src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java
View file

@ -4,7 +4,7 @@ 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.api.item.IBindable;
import wayoftime.bloodmagic.common.item.IBindable;
@Cancelable
public class ItemBindEvent extends Event

2
src/main/java/wayoftime/bloodmagic/gson/Serializers.java
View file

@ -18,7 +18,7 @@ import net.minecraft.network.datasync.IDataSerializer;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistries;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class Serializers
{

51
src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java
View file

@ -1,6 +1,7 @@
package wayoftime.bloodmagic.impl;
import java.util.List;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
@ -8,9 +9,15 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import wayoftime.bloodmagic.altar.ComponentType;
import wayoftime.bloodmagic.api.IBloodMagicAPI;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.incense.EnumTranquilityType;
import wayoftime.bloodmagic.incense.IncenseTranquilityRegistry;
import wayoftime.bloodmagic.incense.TranquilityStack;
import wayoftime.bloodmagic.util.BMLog;
import wayoftime.bloodmagic.will.PlayerDemonWillHandler;
public class BloodMagicAPI implements IBloodMagicAPI
{
@ -36,9 +43,8 @@ public class BloodMagicAPI implements IBloodMagicAPI
// {
// return blacklist;
// }
//
@Nonnull
@Override
public BloodMagicRecipeRegistrar getRecipeRegistrar()
{
return recipeRegistrar;
@ -55,15 +61,7 @@ public class BloodMagicAPI implements IBloodMagicAPI
@Override
public void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType)
{
ComponentType component = null;
for (ComponentType type : ComponentType.VALUES)
{
if (type.name().equalsIgnoreCase(componentType))
{
component = type;
break;
}
}
ComponentType component = ComponentType.getType(componentType);
if (component != null)
{
@ -76,15 +74,7 @@ public class BloodMagicAPI implements IBloodMagicAPI
@Override
public void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType)
{
ComponentType component = null;
for (ComponentType type : ComponentType.VALUES)
{
if (type.name().equalsIgnoreCase(componentType))
{
component = type;
break;
}
}
ComponentType component = ComponentType.getType(componentType);
if (component != null)
{
@ -94,6 +84,27 @@ public class BloodMagicAPI implements IBloodMagicAPI
BMLog.API.warn("Invalid Altar component type: {}.", componentType);
}
@Override
public void registerTranquilityHandler(@Nonnull Predicate<BlockState> blockState, @Nonnull String tranquilityType, double value)
{
EnumTranquilityType type = EnumTranquilityType.getType(tranquilityType);
if (type != null)
{
IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> blockState.test(state) ? new TranquilityStack(type, value) : null);
}
else
{
BMLog.API.warn("Invalid Tranquility type: {}.", tranquilityType);
}
}
@Override
public double getTotalDemonWill(String willType, PlayerEntity player)
{
return PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.getType(willType), player);
}
@Nonnull
public List<BlockState> getComponentStates(ComponentType component)
{

12
src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java
View file

@ -1,11 +1,16 @@
package wayoftime.bloodmagic.impl;
import net.minecraft.block.Blocks;
import net.minecraft.block.FireBlock;
import net.minecraft.block.GrassBlock;
import net.minecraft.block.LeavesBlock;
import net.minecraft.tags.BlockTags;
import wayoftime.bloodmagic.altar.ComponentType;
import wayoftime.bloodmagic.api.IBloodMagicAPI;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.incense.EnumTranquilityType;
import wayoftime.bloodmagic.incense.TranquilityStack;
import wayoftime.bloodmagic.incense.IncenseTranquilityRegistry;
public class BloodMagicCorePlugin
{
@ -28,6 +33,13 @@ public class BloodMagicCorePlugin
api.getValueManager().setTranquility(Blocks.NETHER_WART, new TranquilityStack(EnumTranquilityType.CROP, 1.0D));
api.getValueManager().setTranquility(Blocks.BEETROOTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D));
apiInterface.registerTranquilityHandler(state -> state.getBlock() instanceof LeavesBlock, EnumTranquilityType.PLANT.name(), 1.0D);
apiInterface.registerTranquilityHandler(state -> state.getBlock() instanceof FireBlock, EnumTranquilityType.FIRE.name(), 1.0D);
apiInterface.registerTranquilityHandler(state -> state.getBlock() instanceof GrassBlock, EnumTranquilityType.EARTHEN.name(), 0.5D);
apiInterface.registerTranquilityHandler(state -> BlockTags.LOGS.contains(state.getBlock()), EnumTranquilityType.TREE.name(), 1.0D);
IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> BloodMagicAPI.INSTANCE.getValueManager().getTranquility().get(state));
apiInterface.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), ComponentType.GLOWSTONE.name());
apiInterface.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), ComponentType.GLOWSTONE.name());
apiInterface.registerAltarComponent(BloodMagicBlocks.BLOODSTONE.get().getDefaultState(), ComponentType.BLOODSTONE.name());

317
src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java
View file

@ -16,228 +16,15 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import wayoftime.bloodmagic.api.IBloodMagicRecipeRegistrar;
import wayoftime.bloodmagic.api.recipe.RecipeARC;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.recipe.RecipeARC;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar
public class BloodMagicRecipeRegistrar
{
// private final Set<RecipeBloodAltar> altarRecipes;
// private final Set<RecipeAlchemyTable> alchemyRecipes;
// private final Set<RecipeTartaricForge> tartaricForgeRecipes;
// private final Set<RecipeAlchemyArray> alchemyArrayRecipes;
// private final Set<RecipeSacrificeCraft> sacrificeCraftRecipes;
public BloodMagicRecipeRegistrar()
{
// this.altarRecipes = Sets.newHashSet();
// this.alchemyRecipes = Sets.newHashSet();
// this.tartaricForgeRecipes = Sets.newHashSet();
// this.alchemyArrayRecipes = Sets.newHashSet();
// this.sacrificeCraftRecipes = Sets.newHashSet();
}
// @Override
// public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier,
// @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative.");
// Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative.");
// Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative.");
// Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative.");
//
// // TODO: Got to adda ResourceLocation argument.
// altarRecipes.add(new IRecipeBloodAltar(null, input, output, minimumTier, syphon, consumeRate, drainRate));
// }
//
// @Override
// public boolean removeBloodAltar(@Nonnull ItemStack input)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// return altarRecipes.remove(getBloodAltar(input));
// }
// @Override
// public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks,
// @Nonnegative int minimumTier, @Nonnull Ingredient... input)
// {
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative.");
// Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative.");
// Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative.");
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// NonNullList<Ingredient> inputs = NonNullList.from(Ingredient.EMPTY, input);
// alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier));
// }
//
// public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks,
// @Nonnegative int minimumTier, @Nonnull Object... input)
// {
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative.");
// Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative.");
// Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative.");
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// List<Ingredient> ingredients = Lists.newArrayList();
// for (Object object : input)
// {
// if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb)
// {
// ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object)));
// continue;
// }
//
// ingredients.add(CraftingHelper.getIngredient(object));
// }
//
// addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0]));
// }
//
// public void addAlchemyTable(RecipeAlchemyTable recipe)
// {
// alchemyRecipes.add(recipe);
// }
//
// @Override
// public boolean removeAlchemyTable(@Nonnull ItemStack... input)
// {
// Preconditions.checkNotNull(input, "inputs cannot be null.");
//
// for (ItemStack stack : input) Preconditions.checkNotNull(stack, "input cannot be null.");
//
// return alchemyRecipes.remove(getAlchemyTable(Lists.newArrayList(input)));
// }
//
// @Override
// public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls,
// @Nonnegative double soulDrain, @Nonnull Ingredient... input)
// {
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative.");
// Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative.");
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// NonNullList<Ingredient> inputs = NonNullList.from(Ingredient.EMPTY, input);
// tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain));
// }
//
// @Override
// public boolean removeTartaricForge(@Nonnull ItemStack... input)
// {
// Preconditions.checkNotNull(input, "inputs cannot be null.");
//
// for (ItemStack stack : input) Preconditions.checkNotNull(stack, "input cannot be null.");
//
// return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input)));
// }
//
// public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls,
// @Nonnegative double soulDrain, @Nonnull Object... input)
// {
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative.");
// Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative.");
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// List<Ingredient> ingredients = Lists.newArrayList();
// for (Object object : input)
// {
// if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb)
// {
// ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object)));
// continue;
// }
//
// ingredients.add(CraftingHelper.getIngredient(object));
// }
//
// addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0]));
// }
//
// @Override
// public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output,
// @Nullable ResourceLocation circleTexture)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
// Preconditions.checkNotNull(catalyst, "catalyst cannot be null.");
// Preconditions.checkNotNull(output, "output cannot be null.");
//
// alchemyArrayRecipes.add(new RecipeAlchemyArray(input, catalyst, output, circleTexture));
// }
//
// @Override
// public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
// Preconditions.checkNotNull(catalyst, "catalyst cannot be null.");
//
// return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst));
// }
//
// public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output,
// @Nullable ResourceLocation circleTexture)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
// Preconditions.checkNotNull(catalyst, "catalyst cannot be null.");
// Preconditions.checkNotNull(output, "output cannot be null.");
//
// addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture);
// }
//
// public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired,
// @Nonnull Object... input)
// {
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative.");
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// List<Ingredient> ingredients = Lists.newArrayList();
// for (Object object : input)
// {
// if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb)
// {
// ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object)));
// continue;
// }
//
// ingredients.add(CraftingHelper.getIngredient(object));
// }
//
// addSacrificeCraft(output, healthRequired, ingredients.toArray(new Ingredient[0]));
// }
//
// @Override
// public boolean removeSacrificeCraft(@Nonnull ItemStack... input)
// {
// Preconditions.checkNotNull(input, "inputs cannot be null.");
//
// for (ItemStack stack : input) Preconditions.checkNotNull(stack, "input cannot be null.");
//
// return sacrificeCraftRecipes.remove(getSacrificeCraft(Lists.newArrayList(input)));
// }
//
// @Override
// public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired,
// @Nonnull Ingredient... input)
// {
// Preconditions.checkNotNull(output, "output cannot be null.");
// Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative.");
// Preconditions.checkNotNull(input, "input cannot be null.");
//
// NonNullList<Ingredient> inputs = NonNullList.from(Ingredient.EMPTY, input);
// sacrificeCraftRecipes.add(new RecipeSacrificeCraft(inputs, output, healthRequired));
// }
@Nullable
public RecipeBloodAltar getBloodAltar(World world, @Nonnull ItemStack input)
{
@ -287,44 +74,6 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar
return null;
}
// @Nullable
// public RecipeAlchemyTable getAlchemyTable(@Nonnull List<ItemStack> input)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
// if (input.isEmpty())
// return null;
//
// mainLoop: for (RecipeAlchemyTable recipe : alchemyRecipes)
// {
// if (recipe.getInput().size() != input.size())
// continue;
//
// List<Ingredient> recipeInput = new ArrayList<>(recipe.getInput());
//
// for (int i = 0; i < input.size(); i++)
// {
// boolean matched = false;
// for (int j = 0; j < recipeInput.size(); j++)
// {
// Ingredient ingredient = recipeInput.get(j);
// if (ingredient.apply(input.get(i)))
// {
// matched = true;
// recipeInput.remove(j);
// break;
// }
// }
//
// if (!matched)
// continue mainLoop;
// }
//
// return recipe;
// }
//
// return null;
// }
//
@Nullable
public RecipeAlchemyTable getAlchemyTable(World world, @Nonnull List<ItemStack> input)
{
@ -403,45 +152,6 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar
return null;
}
//
// @Nullable
// public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List<ItemStack> input)
// {
// Preconditions.checkNotNull(input, "input cannot be null.");
// if (input.isEmpty())
// return null;
//
// mainLoop: for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes)
// {
// if (recipe.getInput().size() != input.size())
// continue;
//
// List<Ingredient> recipeInput = new ArrayList<>(recipe.getInput());
//
// for (int i = 0; i < input.size(); i++)
// {
// boolean matched = false;
// for (int j = 0; j < recipeInput.size(); j++)
// {
// Ingredient ingredient = recipeInput.get(j);
// if (ingredient.apply(input.get(i)))
// {
// matched = true;
// recipeInput.remove(j);
// break;
// }
// }
//
// if (!matched)
// continue mainLoop;
// }
//
// return recipe;
// }
//
// return null;
// }
//
/**
*
* @param world
@ -516,19 +226,4 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar
return copyRecipes;
}
// public Set<RecipeAlchemyTable> getAlchemyRecipes()
// {
// return ImmutableSet.copyOf(alchemyRecipes);
// }
//
// public Set<RecipeTartaricForge> getTartaricForgeRecipes()
// {
// return ImmutableSet.copyOf(tartaricForgeRecipes);
// }
//
// public Set<RecipeAlchemyArray> getAlchemyArrayRecipes()
// {
// return ImmutableSet.copyOf(alchemyArrayRecipes);
// }
}

13
src/main/java/wayoftime/bloodmagic/incense/EnumTranquilityType.java
View file

@ -9,4 +9,17 @@ public enum EnumTranquilityType
WATER(),
FIRE(),
LAVA(),;
public static EnumTranquilityType getType(String type)
{
for (EnumTranquilityType t : values())
{
if (t.name().equalsIgnoreCase(type))
{
return t;
}
}
return null;
}
}

3
src/main/java/wayoftime/bloodmagic/incense/ITranquilityHandler.java
View file

@ -5,6 +5,9 @@ import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**
* This is a functional interface to return the TranquilityStack of a certain Block type
*/
public interface ITranquilityHandler
{
TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state);

3
src/main/java/wayoftime/bloodmagic/incense/TranquilityStack.java
View file

@ -1,5 +1,8 @@
package wayoftime.bloodmagic.incense;
/**
* Holds the tranquility type and value for valid tranquility modifiers
*/
public class TranquilityStack
{
public final EnumTranquilityType type;

2
src/main/java/wayoftime/bloodmagic/network/DemonAuraClientPacket.java
View file

@ -8,7 +8,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.network.NetworkEvent.Context;
import wayoftime.bloodmagic.util.handler.event.ClientHandler;
import wayoftime.bloodmagic.will.DemonWillHolder;
import wayoftime.bloodmagic.will.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class DemonAuraClientPacket
{

11
src/main/java/wayoftime/bloodmagic/orb/IBloodOrb.java
View file

@ -1,11 +0,0 @@
package wayoftime.bloodmagic.orb;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
public interface IBloodOrb
{
@Nullable
BloodOrb getOrb(ItemStack stack);
}

4
src/main/java/wayoftime/bloodmagic/api/recipe/BloodMagicRecipe.java → src/main/java/wayoftime/bloodmagic/recipe/BloodMagicRecipe.java
View file

@ -1,4 +1,4 @@
package wayoftime.bloodmagic.api.recipe;
package wayoftime.bloodmagic.recipe;
import javax.annotation.Nonnull;
@ -7,7 +7,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import wayoftime.bloodmagic.api.inventory.IgnoredIInventory;
import wayoftime.bloodmagic.recipe.helper.IgnoredIInventory;
public abstract class BloodMagicRecipe implements IRecipe<IgnoredIInventory>
{

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