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

Initial 1.9 commit

Browse source 
This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.
This commit is contained in:
Nick 2016-03-17 13:00:44 -07:00
parent f896383fe6
commit 6c729db70c
359 changed files with 1858 additions and 4447 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/api/BlockStack.java
View file

@ -5,7 +5,7 @@ import lombok.Getter;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameData;

12
src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
View file

@ -1,10 +1,6 @@
package WayofTime.bloodmagic.api;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import WayofTime.bloodmagic.api.util.helper.LogHelper;
import lombok.Getter;
import lombok.Setter;
import net.minecraft.block.Block;
@ -13,7 +9,11 @@ import net.minecraft.item.Item;
import net.minecraft.util.DamageSource;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fml.common.registry.GameRegistry;
import WayofTime.bloodmagic.api.util.helper.LogHelper;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* The primary API class. Includes helper methods and blacklists.

6
src/main/java/WayofTime/bloodmagic/api/Constants.java
View file

@ -1,13 +1,13 @@
package WayofTime.bloodmagic.api;
import java.util.Locale;
import lombok.Getter;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.potion.Potion;
import net.minecraftforge.fml.common.registry.GameRegistry;
import java.util.Locale;
public class Constants
{
public static class NBT
@ -144,7 +144,7 @@ public class Constants
public static class Misc
{
public static final int POTION_ARRAY_SIZE = Potion.potionTypes.length;
public static final int POTION_ARRAY_SIZE = 256;
}
public enum BloodMagicItem

12
src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java
View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.api;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IChatComponent;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
public class DamageSourceBloodMagic extends DamageSource
{
@ -17,8 +17,8 @@ public class DamageSourceBloodMagic extends DamageSource
}
@Override
public IChatComponent getDeathMessage(EntityLivingBase livingBase)
public ITextComponent getDeathMessage(EntityLivingBase livingBase)
{
return new ChatComponentText(TextHelper.localizeEffect("chat.BloodMagic.damageSource", livingBase.getName()));
return new TextComponentString(TextHelper.localizeEffect("chat.BloodMagic.damageSource", livingBase.getName()));
}
}

2
src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java
View file

@ -4,7 +4,7 @@ import lombok.Getter;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect
{

4
src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
View file

@ -3,7 +3,7 @@ package WayofTime.bloodmagic.api.alchemyCrafting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
@ -73,7 +73,7 @@ public class AlchemyCircleRenderer
public void renderAt(TileEntity tile, double x, double y, double z, float craftTime)
{
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer wr = tessellator.getWorldRenderer();
VertexBuffer wr = tessellator.getBuffer();
GlStateManager.pushMatrix();
// float rot = (float)(this.worldObj.provider.getWorldTime() % (360 /

2
src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.altar;
import lombok.Getter;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
/**
* Used for building the altar structure.

6
src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java
View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.api.altar;
import java.util.ArrayList;
import lombok.Getter;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import java.util.ArrayList;
//@formatter:off
@Getter

6
src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java
View file

@ -1,13 +1,13 @@
package WayofTime.bloodmagic.api.compress;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/**
* A registry aimed to help compress items in an inventory into its compressible
* form.

2
src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java
View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.api.event;
import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
import lombok.Getter;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.eventhandler.Event;
import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
/**
* Fired whenever a craft is completed in a BloodAltar.

13
src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java
View file

@ -1,15 +1,14 @@
package WayofTime.bloodmagic.api.event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.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 net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
public class RitualEvent extends Event
{
@ -51,7 +50,7 @@ public class RitualEvent extends Event
* This event is called when a Ritual effect is performed. If cancelled, the
* effect will not happen.
*
* {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)}
* {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)}
*/
@Cancelable
public static class RitualRunEvent extends RitualEvent

4
src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java
View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.api.event;
import WayofTime.bloodmagic.api.BlockStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
import WayofTime.bloodmagic.api.BlockStack;
/**
* Fired when a teleposer attempts to transpose two blocks. Use this to perform

4
src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java
View file

@ -1,8 +1,8 @@
package WayofTime.bloodmagic.api.iface;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.BlockStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**
* Used to define a HarvestHandler for the Harvest Ritual.

4
src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java
View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.api.iface;
import java.util.List;
import net.minecraft.item.ItemStack;
import java.util.List;
/**
* This interface is used for items intended to train specific upgrades while
* held in the player's inventory.

2
src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.incense;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IIncensePath

8
src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java
View file

@ -1,13 +1,13 @@
package WayofTime.bloodmagic.api.incense;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
public class IncenseTranquilityRegistry
{
public static List<TranquilityHandler> handlerList = new ArrayList<TranquilityHandler>();

2
src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java
View file

@ -2,7 +2,7 @@ package WayofTime.bloodmagic.api.incense;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public abstract class TranquilityHandler

3
src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java
View file

@ -1,12 +1,11 @@
package WayofTime.bloodmagic.api.livingArmour;
import com.google.common.collect.Multimap;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import com.google.common.collect.Multimap;
/**
* An interface this is used purely for internal implementation.
*

4
src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java
View file

@ -1,12 +1,12 @@
package WayofTime.bloodmagic.api.livingArmour;
import net.minecraft.nbt.NBTTagCompound;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
public class LivingArmourHandler
{
public static List<Class<? extends StatTracker>> trackers = new ArrayList<Class<? extends StatTracker>>();

5
src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java
View file

@ -1,5 +1,7 @@
package WayofTime.bloodmagic.api.livingArmour;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
@ -7,9 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
public abstract class LivingArmourUpgrade
{
public static String chatBase = "chat.BloodMagic.livingArmour.upgrade.";

6
src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java
View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.api.livingArmour;
import java.util.List;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import java.util.List;
public abstract class StatTracker
{

22
src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java
View file

@ -1,7 +1,11 @@
package WayofTime.bloodmagic.api.network;
import javax.annotation.Nullable;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import com.google.common.base.Strings;
import lombok.Getter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
@ -11,14 +15,10 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraft.world.WorldSavedData;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.Event;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import com.google.common.base.Strings;
import javax.annotation.Nullable;
@Getter
public class SoulNetwork extends WorldSavedData
@ -58,10 +58,10 @@ public class SoulNetwork extends WorldSavedData
if (MinecraftForge.EVENT_BUS.post(event))
return 0;
if (MinecraftServer.getServer() == null)
if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
return 0;
World world = MinecraftServer.getServer().worldServers[0];
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
SoulNetwork data = (SoulNetwork) world.loadItemData(SoulNetwork.class, event.ownerNetwork);
if (data == null)
@ -177,7 +177,7 @@ public class SoulNetwork extends WorldSavedData
{
if (getPlayer() != null)
{
getPlayer().addPotionEffect(new PotionEffect(Potion.confusion.getId(), 99));
getPlayer().addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("confusion"), 99));
}
}

14
src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java
View file

@ -1,11 +1,6 @@
package WayofTime.bloodmagic.api.recipe;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import net.minecraft.block.Block;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
@ -14,7 +9,12 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
* Shaped Blood Orb Recipe Handler by joshie *

14
src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java
View file

@ -1,11 +1,6 @@
package WayofTime.bloodmagic.api.recipe;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import net.minecraft.block.Block;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
@ -14,7 +9,12 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
* Shapeless Blood Orb Recipe Handler by joshie *

10
src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java
View file

@ -1,17 +1,17 @@
package WayofTime.bloodmagic.api.recipe;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import lombok.Getter;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class TartaricForgeRecipe
{
protected ItemStack output = null;

18
src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java
View file

@ -1,21 +1,19 @@
package WayofTime.bloodmagic.api.registry;
import java.util.Map.Entry;
import javax.annotation.Nullable;
import WayofTime.bloodmagic.api.ItemStackWrapper;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import WayofTime.bloodmagic.api.ItemStackWrapper;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import javax.annotation.Nullable;
import java.util.Map.Entry;
public class AlchemyArrayRecipeRegistry
{

11
src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java
View file

@ -1,16 +1,15 @@
package WayofTime.bloodmagic.api.registry;
import javax.annotation.Nullable;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import javax.annotation.Nullable;
public class AltarRecipeRegistry
{

13
src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java
View file

@ -1,16 +1,11 @@
package WayofTime.bloodmagic.api.registry;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStem;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.iface.IHarvestHandler;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStem;
import java.util.*;
public class HarvestRegistry
{

9
src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java
View file

@ -1,16 +1,15 @@
package WayofTime.bloodmagic.api.registry;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public class ImperfectRitualRegistry
{
public static final Map<ImperfectRitual, Boolean> enabledRituals = new HashMap<ImperfectRitual, Boolean>();

23
src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
View file

@ -1,24 +1,23 @@
package WayofTime.bloodmagic.api.registry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import com.google.common.collect.ArrayListMultimap;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import com.google.common.collect.ArrayListMultimap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* This is only for those who wish to add a basic {@link BloodOrb}. If you need

11
src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java
View file

@ -1,15 +1,14 @@
package WayofTime.bloodmagic.api.registry;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.Ritual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.Ritual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
public class RitualRegistry
{
public static final Map<Ritual, Boolean> enabledRituals = new HashMap<Ritual, Boolean>();

10
src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java
View file

@ -1,13 +1,13 @@
package WayofTime.bloodmagic.api.registry;
import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
public class TartaricForgeRecipeRegistry
{
private static List<TartaricForgeRecipe> recipeList = new ArrayList<TartaricForgeRecipe>();

7
src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java
View file

@ -1,14 +1,15 @@
package WayofTime.bloodmagic.api.ritual;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.function.Consumer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
public abstract class AreaDescriptor implements Iterator<BlockPos>
{
public List<BlockPos> getContainedPositions(BlockPos pos)

4
src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java
View file

@ -1,12 +1,12 @@
package WayofTime.bloodmagic.api.ritual;
import java.util.concurrent.Callable;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import java.util.concurrent.Callable;
public final class CapabilityRuneType
{
public static class RuneTypeStorage implements Capability.IStorage<IRitualStone.Tile>

6
src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.api.ritual;
import java.util.Locale;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import WayofTime.bloodmagic.api.Constants;
import java.util.Locale;
public enum EnumRuneType implements IStringSerializable
{

2
src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java
View file

@ -2,8 +2,8 @@ package WayofTime.bloodmagic.api.ritual;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**

2
src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java
View file

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

10
src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java
View file

@ -1,9 +1,5 @@
package WayofTime.bloodmagic.api.ritual;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@ -11,9 +7,13 @@ import lombok.ToString;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
/**
* Abstract class for creating new rituals. Rituals need be registered with
* {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)}

2
src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java
View file

@ -2,8 +2,8 @@ package WayofTime.bloodmagic.api.ritual;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
/**
* Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage

2
src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.ritual.imperfect;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**

5
src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java
View file

@ -1,12 +1,11 @@
package WayofTime.bloodmagic.api.ritual.imperfect;
import WayofTime.bloodmagic.api.BlockStack;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.BlockStack;
/**
* Abstract class for creating new imperfect rituals. ImperfectRituals need be
@ -40,7 +39,7 @@ public abstract class ImperfectRitual
/**
* Called when the player activates the ritual
* {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, BlockPos, ImperfectRitual, EntityPlayer)}
* {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, EntityPlayer)}
*
* @param imperfectRitualStone
* - The {@link IImperfectRitualStone} that the ritual is bound to

4
src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java
View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.api.soul;
import net.minecraft.nbt.NBTTagCompound;
import java.util.HashMap;
import java.util.Map.Entry;
import net.minecraft.nbt.NBTTagCompound;
public class DemonWillHolder
{
public HashMap<EnumDemonWillType, Double> willMap = new HashMap<EnumDemonWillType, Double>();

2
src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.soul;
import net.minecraft.util.IStringSerializable;
import lombok.Getter;
import net.minecraft.util.IStringSerializable;
@Getter
public enum EnumDemonWillType implements IStringSerializable

4
src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java
View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.api.soul;
import java.util.List;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import java.util.List;
public interface IDemonWillWeapon
{
List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting);

6
src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java
View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.api.teleport;
import java.io.Serializable;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import java.io.Serializable;
@ToString
@EqualsAndHashCode

8
src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java
View file

@ -1,12 +1,12 @@
package WayofTime.bloodmagic.api.teleport;
import java.io.Serializable;
import WayofTime.bloodmagic.api.Constants;
import lombok.Getter;
import lombok.ToString;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.util.math.BlockPos;
import java.io.Serializable;
@ToString
public class PortalLocation implements Serializable

2
src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java
View file

@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import net.minecraft.entity.Entity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
@ToString
@EqualsAndHashCode

6
src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java
View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.api.teleport;
import java.util.ArrayList;
import java.util.List;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import java.util.ArrayList;
import java.util.List;
public class TeleportQueue
{
private static TeleportQueue INSTANCE = new TeleportQueue();

2
src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.api.teleport;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.Teleporter;
import net.minecraft.world.WorldServer;

10
src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java
View file

@ -1,14 +1,14 @@
package WayofTime.bloodmagic.api.util.helper;
import java.util.UUID;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.ItemBindEvent;
import WayofTime.bloodmagic.api.iface.IBindable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.ItemBindEvent;
import WayofTime.bloodmagic.api.iface.IBindable;
import java.util.UUID;
public class BindableHelper
{

2
src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java
View file

@ -1,8 +1,8 @@
package WayofTime.bloodmagic.api.util.helper;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import WayofTime.bloodmagic.api.Constants;
public class IncenseHelper
{

3
src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java
View file

@ -1,10 +1,9 @@
package WayofTime.bloodmagic.api.util.helper;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import WayofTime.bloodmagic.api.BloodMagicAPI;
public class LogHelper
{
private Logger logger;

28
src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java
View file

@ -1,23 +1,23 @@
package WayofTime.bloodmagic.api.util.helper;
import java.util.UUID;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
import WayofTime.bloodmagic.api.network.SoulNetwork;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import WayofTime.bloodmagic.api.registry.OrbRegistry;
import com.google.common.base.Strings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.Event;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
import WayofTime.bloodmagic.api.network.SoulNetwork;
import com.google.common.base.Strings;
import java.util.UUID;
public class NetworkHelper
{
@ -271,10 +271,10 @@ public class NetworkHelper
@Deprecated
public static int syphonFromNetwork(String ownerName, int syphon)
{
if (MinecraftServer.getServer() == null)
if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
return 0;
World world = MinecraftServer.getServer().worldServers[0];
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
SoulNetwork network = (SoulNetwork) world.loadItemData(SoulNetwork.class, ownerName);
if (network == null)
@ -308,10 +308,10 @@ public class NetworkHelper
if (MinecraftForge.EVENT_BUS.post(event))
return 0;
if (MinecraftServer.getServer() == null)
if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
return 0;
World world = MinecraftServer.getServer().worldServers[0];
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
SoulNetwork data = (SoulNetwork) world.loadItemData(SoulNetwork.class, event.ownerNetwork);
if (data == null)
@ -337,10 +337,10 @@ public class NetworkHelper
@Deprecated
public static int getCurrentEssence(String ownerName)
{
if (MinecraftServer.getServer() == null)
if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
return 0;
World world = MinecraftServer.getServer().worldServers[0];
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
SoulNetwork network = (SoulNetwork) world.loadItemData(SoulNetwork.class, ownerName);
if (network == null)

15
src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java
View file

@ -1,8 +1,8 @@
package WayofTime.bloodmagic.api.util.helper;
import java.util.ArrayList;
import java.util.UUID;
import WayofTime.bloodmagic.api.Constants;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@ -12,10 +12,9 @@ import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import WayofTime.bloodmagic.api.Constants;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.UUID;
public class PlayerHelper
{
@ -36,7 +35,7 @@ public class PlayerHelper
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
return null;
return MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(username);
return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUsername(username);
}
public static EntityPlayer getPlayerFromUUID(String uuid)
@ -94,6 +93,6 @@ public class PlayerHelper
if (player == null)
return;
player.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("confusion"), 80));
}
}

7
src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java
View file

@ -1,12 +1,13 @@
package WayofTime.bloodmagic.api.util.helper;
import WayofTime.bloodmagic.api.altar.IBloodAltar;
import WayofTime.bloodmagic.registry.ModPotions;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.altar.IBloodAltar;
public class PlayerSacrificeHelper
{
@ -63,7 +64,7 @@ public class PlayerSacrificeHelper
{
player.setHealth(maxHealth / 10.0f);
setPlayerIncense(player, 0);
player.addPotionEffect(new PotionEffect(soulFrayId.id, soulFrayDuration));
player.addPotionEffect(new PotionEffect(ModPotions.soulFray, soulFrayDuration));
return true;
}

18
src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java
View file

@ -1,19 +1,19 @@
package WayofTime.bloodmagic.api.util.helper;
import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import WayofTime.bloodmagic.api.registry.RitualRegistry;
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
import WayofTime.bloodmagic.api.ritual.IRitualStone;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.RitualComponent;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import java.util.ArrayList;
public class RitualHelper
{