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

Formatted the code - Release state for Blood Magic 1.8.9-2.0.0-1

Browse source
This commit is contained in:
WayofTime 2016-01-02 17:56:37 -05:00
parent d1ff8c6d4f
commit 71421b7d88
38 changed files with 223 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java
View file

@ -20,7 +20,7 @@ public interface ICompatibility
* found.
*
* Generally a determined by a config option.
*
*
* @return If Compatibility should load.
*/
boolean enableCompat();

12
src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
View file

@ -29,17 +29,9 @@ public class BloodMagicPlugin implements IModPlugin
@Override
public void register(IModRegistry registry)
{
registry.addRecipeCategories(
new AltarRecipeCategory(),
new BindingRecipeCategory(),
new AlchemyArrayCraftingCategory()
);
registry.addRecipeCategories(new AltarRecipeCategory(), new BindingRecipeCategory(), new AlchemyArrayCraftingCategory());
registry.addRecipeHandlers(
new AltarRecipeHandler(),
new BindingRecipeHandler(),
new AlchemyArrayCraftingRecipeHandler()
);
registry.addRecipeHandlers(new AltarRecipeHandler(), new BindingRecipeHandler(), new AlchemyArrayCraftingRecipeHandler());
registry.addRecipes(AltarRecipeMaker.getRecipes());
registry.addRecipes(BindingRecipeMaker.getRecipes());

47
src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
View file

@ -22,8 +22,9 @@ import net.minecraft.world.World;
import java.util.List;
/**
* Integrated from WailaPlugins by <a href="https://github.com/tterrag1098">tterrag1098</a>.
* Originally implemented in ImLookingAtBlood by <a href="https://github.com/Pokefenn">Pokefenn</a>.
* Integrated from WailaPlugins by <a
* href="https://github.com/tterrag1098">tterrag1098</a>. Originally implemented
* in ImLookingAtBlood by <a href="https://github.com/Pokefenn">Pokefenn</a>.
*/
public class DataProviderBloodAltar implements IWailaDataProvider
{
@ -50,27 +51,27 @@ public class DataProviderBloodAltar implements IWailaDataProvider
switch (ConfigHandler.wailaAltarDisplayMode)
{
case 0:
{
hasSigil = hasSeer = true;
break;
}
case 1:
{
hasSeer = accessor.getPlayer().getHeldItem() != null && accessor.getPlayer().getHeldItem().getItem() instanceof ItemSigilSeer;
hasSigil = hasSeer || accessor.getPlayer().getHeldItem() != null && accessor.getPlayer().getHeldItem().getItem() instanceof ItemSigilDivination;
break;
}
case 2:
{
hasSeer = hasStack(new ItemStack(ModItems.sigilSeer), accessor.getPlayer());
hasSigil = hasSeer || hasStack(new ItemStack(ModItems.sigilDivination), accessor.getPlayer());
break;
}
default:
{
break;
}
case 0:
{
hasSigil = hasSeer = true;
break;
}
case 1:
{
hasSeer = accessor.getPlayer().getHeldItem() != null && accessor.getPlayer().getHeldItem().getItem() instanceof ItemSigilSeer;
hasSigil = hasSeer || accessor.getPlayer().getHeldItem() != null && accessor.getPlayer().getHeldItem().getItem() instanceof ItemSigilDivination;
break;
}
case 2:
{
hasSeer = hasStack(new ItemStack(ModItems.sigilSeer), accessor.getPlayer());
hasSigil = hasSeer || hasStack(new ItemStack(ModItems.sigilDivination), accessor.getPlayer());
break;
}
default:
{
break;
}
}
if (!hasSeer && !hasSigil)