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

Comment out Waila compat until Waila updates mappings

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-05-01 13:55:15 -07:00
parent f754d14927
commit d10d6e6275
8 changed files with 448 additions and 449 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -60,8 +60,8 @@ repositories {
dependencies { dependencies {
deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
deobfCompile "mcp.mobius.waila:Waila:${waila_version}_${mc_version}:dev"
// deobfCompile "mcp.mobius.waila:Waila:${waila_version}_${mc_version}:dev"
// deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}" // deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}"
// compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar" // compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar"
// compile name: 'Baubles', version: "${baubles_version}", ext: 'jar' // compile name: 'Baubles', version: "${baubles_version}", ext: 'jar'

52
src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java
View file

@ -1,26 +1,26 @@
package WayofTime.bloodmagic.compat.waila; //package WayofTime.bloodmagic.compat.waila;
//
import net.minecraftforge.fml.common.event.FMLInterModComms; //import net.minecraftforge.fml.common.event.FMLInterModComms;
import WayofTime.bloodmagic.compat.ICompatibility; //import WayofTime.bloodmagic.compat.ICompatibility;
//
public class CompatibilityWaila implements ICompatibility //public class CompatibilityWaila implements ICompatibility
{ //{
@Override // @Override
public void loadCompatibility(InitializationPhase phase) // public void loadCompatibility(InitializationPhase phase)
{ // {
if (phase == InitializationPhase.INIT) // if (phase == InitializationPhase.INIT)
FMLInterModComms.sendMessage(getModId(), "register", "WayofTime.bloodmagic.compat.waila.WailaCallbackHandler.callbackRegister"); // FMLInterModComms.sendMessage(getModId(), "register", "WayofTime.bloodmagic.compat.waila.WailaCallbackHandler.callbackRegister");
} // }
//
@Override // @Override
public String getModId() // public String getModId()
{ // {
return "Waila"; // return "Waila";
} // }
//
@Override // @Override
public boolean enableCompat() // public boolean enableCompat()
{ // {
return true; // return true;
} // }
} //}

60
src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java
View file

@ -1,30 +1,30 @@
package WayofTime.bloodmagic.compat.waila; //package WayofTime.bloodmagic.compat.waila;
//
import mcp.mobius.waila.api.IWailaRegistrar; //import mcp.mobius.waila.api.IWailaRegistrar;
import WayofTime.bloodmagic.api.Constants; //import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.BlockAlchemyArray; //import WayofTime.bloodmagic.block.BlockAlchemyArray;
import WayofTime.bloodmagic.block.BlockAltar; //import WayofTime.bloodmagic.block.BlockAltar;
import WayofTime.bloodmagic.block.BlockRitualController; //import WayofTime.bloodmagic.block.BlockRitualController;
import WayofTime.bloodmagic.block.BlockTeleposer; //import WayofTime.bloodmagic.block.BlockTeleposer;
import WayofTime.bloodmagic.compat.waila.provider.DataProviderAlchemyArray; //import WayofTime.bloodmagic.compat.waila.provider.DataProviderAlchemyArray;
import WayofTime.bloodmagic.compat.waila.provider.DataProviderBloodAltar; //import WayofTime.bloodmagic.compat.waila.provider.DataProviderBloodAltar;
import WayofTime.bloodmagic.compat.waila.provider.DataProviderRitualController; //import WayofTime.bloodmagic.compat.waila.provider.DataProviderRitualController;
import WayofTime.bloodmagic.compat.waila.provider.DataProviderTeleposer; //import WayofTime.bloodmagic.compat.waila.provider.DataProviderTeleposer;
//
public class WailaCallbackHandler //public class WailaCallbackHandler
{ //{
public static void callbackRegister(IWailaRegistrar registrar) // public static void callbackRegister(IWailaRegistrar registrar)
{ // {
registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class); // registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class);
registrar.registerBodyProvider(new DataProviderTeleposer(), BlockTeleposer.class); // registrar.registerBodyProvider(new DataProviderTeleposer(), BlockTeleposer.class);
registrar.registerBodyProvider(new DataProviderRitualController(), BlockRitualController.class); // registrar.registerBodyProvider(new DataProviderRitualController(), BlockRitualController.class);
registrar.registerBodyProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class); // registrar.registerBodyProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class);
registrar.registerStackProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class); // registrar.registerStackProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class);
//
registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false); // registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false);
registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true); // registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true);
registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true); // registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true);
registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true); // registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true);
registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true); // registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true);
} // }
} //}

142
src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java
View file

@ -1,71 +1,71 @@
package WayofTime.bloodmagic.compat.waila.provider; //package WayofTime.bloodmagic.compat.waila.provider;
//
import java.util.List; //import java.util.List;
//
import mcp.mobius.waila.api.IWailaConfigHandler; //import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor; //import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider; //import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP; //import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; //import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; //import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; //import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; //import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; //import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants; //import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.registry.ModBlocks; //import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.ModItems; //import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.tile.TileAlchemyArray; //import WayofTime.bloodmagic.tile.TileAlchemyArray;
import WayofTime.bloodmagic.util.helper.TextHelper; //import WayofTime.bloodmagic.util.helper.TextHelper;
//
public class DataProviderAlchemyArray implements IWailaDataProvider //public class DataProviderAlchemyArray implements IWailaDataProvider
{ //{
@Override // @Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) // public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return new ItemStack(ModItems.arcaneAshes).setStackDisplayName(TextHelper.getFormattedText(ModBlocks.alchemyArray.getLocalizedName())); // return new ItemStack(ModItems.arcaneAshes).setStackDisplayName(TextHelper.getFormattedText(ModBlocks.alchemyArray.getLocalizedName()));
} // }
//
@Override // @Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ARRAY)) // if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ARRAY))
return currenttip; // return currenttip;
//
if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) // if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK))
{ // {
TileEntity tile = accessor.getTileEntity(); // TileEntity tile = accessor.getTileEntity();
if (tile instanceof TileAlchemyArray) // if (tile instanceof TileAlchemyArray)
{ // {
TileAlchemyArray tileArray = (TileAlchemyArray) tile; // TileAlchemyArray tileArray = (TileAlchemyArray) tile;
if (tileArray.getStackInSlot(0) != null) // if (tileArray.getStackInSlot(0) != null)
currenttip.add(TextHelper.localize("waila.BloodMagic.array.reagent", tileArray.getStackInSlot(0).getDisplayName())); // currenttip.add(TextHelper.localize("waila.BloodMagic.array.reagent", tileArray.getStackInSlot(0).getDisplayName()));
//
if (tileArray.getStackInSlot(1) != null) // if (tileArray.getStackInSlot(1) != null)
currenttip.add(TextHelper.localize("waila.BloodMagic.array.catalyst", tileArray.getStackInSlot(1).getDisplayName())); // currenttip.add(TextHelper.localize("waila.BloodMagic.array.catalyst", tileArray.getStackInSlot(1).getDisplayName()));
} // }
} else // } else
{ // {
currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); // currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak"));
} // }
//
return currenttip; // return currenttip;
} // }
//
@Override // @Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) // public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos)
{ // {
return null; // return null;
} // }
} //}

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

@ -1,142 +1,142 @@
package WayofTime.bloodmagic.compat.waila.provider; //package WayofTime.bloodmagic.compat.waila.provider;
//
import java.util.List; //import java.util.List;
//
import mcp.mobius.waila.api.IWailaConfigHandler; //import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor; //import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider; //import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayer; //import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; //import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; //import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; //import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; //import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; //import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; //import net.minecraft.world.World;
import WayofTime.bloodmagic.ConfigHandler; //import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.api.Constants; //import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.BlockAltar; //import WayofTime.bloodmagic.block.BlockAltar;
import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; //import WayofTime.bloodmagic.item.sigil.ItemSigilDivination;
import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; //import WayofTime.bloodmagic.item.sigil.ItemSigilSeer;
import WayofTime.bloodmagic.registry.ModItems; //import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.tile.TileAltar; //import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.helper.TextHelper; //import WayofTime.bloodmagic.util.helper.TextHelper;
//
/** ///**
* Integrated from WailaPlugins by <a // * Integrated from WailaPlugins by <a
* href="https://github.com/tterrag1098">tterrag1098</a>. Originally implemented // * href="https://github.com/tterrag1098">tterrag1098</a>. Originally implemented
* in ImLookingAtBlood by <a href="https://github.com/Pokefenn">Pokefenn</a>. // * in ImLookingAtBlood by <a href="https://github.com/Pokefenn">Pokefenn</a>.
*/ // */
public class DataProviderBloodAltar implements IWailaDataProvider //public class DataProviderBloodAltar implements IWailaDataProvider
{ //{
@Override // @Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) // public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) // if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR))
return currenttip; // return currenttip;
//
boolean hasSigil = false; // boolean hasSigil = false;
boolean hasSeer = false; // boolean hasSeer = false;
//
switch (ConfigHandler.wailaAltarDisplayMode) // switch (ConfigHandler.wailaAltarDisplayMode)
{ // {
case 0: // case 0:
{ // {
hasSigil = hasSeer = true; // hasSigil = hasSeer = true;
break; // break;
} // }
case 1: // case 1:
{ // {
hasSeer = holdingSeerSigil(accessor.getPlayer()); // hasSeer = holdingSeerSigil(accessor.getPlayer());
hasSigil = hasSeer || holdingDivinationSigil(accessor.getPlayer()); // hasSigil = hasSeer || holdingDivinationSigil(accessor.getPlayer());
break; // break;
} // }
case 2: // case 2:
{ // {
hasSeer = hasStack(new ItemStack(ModItems.sigilSeer), accessor.getPlayer()); // hasSeer = hasStack(new ItemStack(ModItems.sigilSeer), accessor.getPlayer());
hasSigil = hasSeer || hasStack(new ItemStack(ModItems.sigilDivination), accessor.getPlayer()); // hasSigil = hasSeer || hasStack(new ItemStack(ModItems.sigilDivination), accessor.getPlayer());
break; // break;
} // }
default: // default:
{ // {
break; // break;
} // }
} // }
//
if (!hasSeer && !hasSigil) // if (!hasSeer && !hasSigil)
return currenttip; // return currenttip;
//
if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) // if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK))
{ // {
if (accessor.getBlock() instanceof BlockAltar && accessor.getTileEntity() instanceof TileAltar) // if (accessor.getBlock() instanceof BlockAltar && accessor.getTileEntity() instanceof TileAltar)
{ // {
TileAltar altar = (TileAltar) accessor.getTileEntity(); // TileAltar altar = (TileAltar) accessor.getTileEntity();
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarTier", altar.getTier().toInt())); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarTier", altar.getTier().toInt()));
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarCapacity", altar.getCapacity())); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarCapacity", altar.getCapacity()));
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentEssence", altar.getCurrentBlood())); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentEssence", altar.getCurrentBlood()));
//
if (hasSeer) // if (hasSeer)
{ // {
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarProgress.percent", ((int) ((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100)) + "%")); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarProgress.percent", ((int) ((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100)) + "%"));
} // }
} // }
} else // } else
{ // {
currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); // currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak"));
} // }
//
return currenttip; // return currenttip;
} // }
//
@Override // @Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) // public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos)
{ // {
return null; // return null;
} // }
//
public static boolean hasStack(ItemStack stack, EntityPlayer player) // public static boolean hasStack(ItemStack stack, EntityPlayer player)
{ // {
for (ItemStack inventoryStack : player.inventory.mainInventory) // for (ItemStack inventoryStack : player.inventory.mainInventory)
if (inventoryStack != null && inventoryStack.isItemEqual(stack)) // if (inventoryStack != null && inventoryStack.isItemEqual(stack))
return true; // return true;
//
return false; // return false;
} // }
//
private static boolean holdingSeerSigil(EntityPlayer player) { // private static boolean holdingSeerSigil(EntityPlayer player) {
if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilSeer) // if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilSeer)
return true; // return true;
//
if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilSeer) // if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilSeer)
return true; // return true;
//
return false; // return false;
} // }
//
private static boolean holdingDivinationSigil(EntityPlayer player) { // private static boolean holdingDivinationSigil(EntityPlayer player) {
if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination) // if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination)
return true; // return true;
//
if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination) // if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination)
return true; // return true;
//
return false; // return false;
} // }
} //}

206
src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java
View file

@ -1,103 +1,103 @@
package WayofTime.bloodmagic.compat.waila.provider; //package WayofTime.bloodmagic.compat.waila.provider;
//
import java.util.List; //import java.util.List;
//
import mcp.mobius.waila.api.IWailaConfigHandler; //import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor; //import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider; //import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.block.Block; //import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayerMP; //import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; //import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; //import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; //import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; //import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; //import net.minecraft.world.World;
import WayofTime.bloodmagic.api.BlockStack; //import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.Constants; //import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; //import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry;
import WayofTime.bloodmagic.api.registry.RitualRegistry; //import WayofTime.bloodmagic.api.registry.RitualRegistry;
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; //import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper; //import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.block.BlockRitualController; //import WayofTime.bloodmagic.block.BlockRitualController;
import WayofTime.bloodmagic.tile.TileImperfectRitualStone; //import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
import WayofTime.bloodmagic.tile.TileMasterRitualStone; //import WayofTime.bloodmagic.tile.TileMasterRitualStone;
import WayofTime.bloodmagic.util.helper.TextHelper; //import WayofTime.bloodmagic.util.helper.TextHelper;
//
public class DataProviderRitualController implements IWailaDataProvider //public class DataProviderRitualController implements IWailaDataProvider
{ //{
@Override // @Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) // public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
if (!config.getConfig(Constants.Compat.WAILA_CONFIG_RITUAL)) // if (!config.getConfig(Constants.Compat.WAILA_CONFIG_RITUAL))
return currenttip; // return currenttip;
//
if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) // if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK))
{ // {
if (accessor.getBlock() instanceof BlockRitualController) // if (accessor.getBlock() instanceof BlockRitualController)
{ // {
if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 0 && accessor.getTileEntity() instanceof TileMasterRitualStone) // if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 0 && accessor.getTileEntity() instanceof TileMasterRitualStone)
{ // {
TileMasterRitualStone mrs = (TileMasterRitualStone) accessor.getTileEntity(); // TileMasterRitualStone mrs = (TileMasterRitualStone) accessor.getTileEntity();
//
if (mrs.getCurrentRitual() != null) // if (mrs.getCurrentRitual() != null)
{ // {
currenttip.add(TextHelper.localizeEffect(mrs.getCurrentRitual().getUnlocalizedName())); // currenttip.add(TextHelper.localizeEffect(mrs.getCurrentRitual().getUnlocalizedName()));
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromUUID(mrs.getOwner()))); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())));
if (!RitualRegistry.ritualEnabled(mrs.getCurrentRitual())) // if (!RitualRegistry.ritualEnabled(mrs.getCurrentRitual()))
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.config.disabled")); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.config.disabled"));
} else // } else
{ // {
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.deactivated")); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.deactivated"));
} // }
} // }
//
if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 1 && accessor.getTileEntity() instanceof TileImperfectRitualStone) // if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 1 && accessor.getTileEntity() instanceof TileImperfectRitualStone)
{ // {
if (accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock() != null) // if (accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock() != null)
{ // {
Block up = accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock(); // Block up = accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock();
int meta = up.getMetaFromState(accessor.getWorld().getBlockState(accessor.getPosition().up())); // int meta = up.getMetaFromState(accessor.getWorld().getBlockState(accessor.getPosition().up()));
BlockStack blockStack = new BlockStack(up, meta); // BlockStack blockStack = new BlockStack(up, meta);
ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(blockStack); // ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(blockStack);
//
if (ritual != null) // if (ritual != null)
{ // {
currenttip.add(TextHelper.localizeEffect(ritual.getUnlocalizedName())); // currenttip.add(TextHelper.localizeEffect(ritual.getUnlocalizedName()));
if (!ImperfectRitualRegistry.ritualEnabled(ritual)) // if (!ImperfectRitualRegistry.ritualEnabled(ritual))
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.config.disabled")); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.config.disabled"));
} // }
} // }
} // }
} // }
} else // } else
{ // {
currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); // currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak"));
} // }
//
return currenttip; // return currenttip;
} // }
//
@Override // @Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) // public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos)
{ // {
return null; // return null;
} // }
} //}

148
src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java
View file

@ -1,74 +1,74 @@
package WayofTime.bloodmagic.compat.waila.provider; //package WayofTime.bloodmagic.compat.waila.provider;
//
import java.util.List; //import java.util.List;
//
import mcp.mobius.waila.api.IWailaConfigHandler; //import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor; //import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider; //import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP; //import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; //import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; //import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; //import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; //import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; //import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants; //import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.BlockTeleposer; //import WayofTime.bloodmagic.block.BlockTeleposer;
import WayofTime.bloodmagic.item.ItemTelepositionFocus; //import WayofTime.bloodmagic.item.ItemTelepositionFocus;
import WayofTime.bloodmagic.tile.TileTeleposer; //import WayofTime.bloodmagic.tile.TileTeleposer;
import WayofTime.bloodmagic.util.helper.TextHelper; //import WayofTime.bloodmagic.util.helper.TextHelper;
//
public class DataProviderTeleposer implements IWailaDataProvider //public class DataProviderTeleposer implements IWailaDataProvider
{ //{
@Override // @Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) // public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
if (!config.getConfig(Constants.Compat.WAILA_CONFIG_TELEPOSER)) // if (!config.getConfig(Constants.Compat.WAILA_CONFIG_TELEPOSER))
return currenttip; // return currenttip;
//
if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) // if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK))
{ // {
if (accessor.getBlock() instanceof BlockTeleposer && accessor.getTileEntity() instanceof TileTeleposer) // if (accessor.getBlock() instanceof BlockTeleposer && accessor.getTileEntity() instanceof TileTeleposer)
{ // {
TileTeleposer teleposer = (TileTeleposer) accessor.getTileEntity(); // TileTeleposer teleposer = (TileTeleposer) accessor.getTileEntity();
if (teleposer.getStackInSlot(0) != null) // if (teleposer.getStackInSlot(0) != null)
{ // {
ItemStack contained = teleposer.getStackInSlot(0); // ItemStack contained = teleposer.getStackInSlot(0);
BlockPos toPos = ((ItemTelepositionFocus) contained.getItem()).getBlockPos(contained); // BlockPos toPos = ((ItemTelepositionFocus) contained.getItem()).getBlockPos(contained);
int dimensionID = contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID); // int dimensionID = contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID);
//
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.coords", toPos.getX(), toPos.getY(), toPos.getZ())); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.coords", toPos.getX(), toPos.getY(), toPos.getZ()));
currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.dimension", dimensionID)); // currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.dimension", dimensionID));
} // }
} // }
} else // } else
{ // {
currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); // currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak"));
} // }
//
return currenttip; // return currenttip;
} // }
//
@Override // @Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) // public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{ // {
return null; // return null;
} // }
//
@Override // @Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) // public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos)
{ // {
return null; // return null;
} // }
} //}

3
src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java
View file

@ -2,7 +2,6 @@ package WayofTime.bloodmagic.registry;
import WayofTime.bloodmagic.compat.ICompatibility; import WayofTime.bloodmagic.compat.ICompatibility;
import WayofTime.bloodmagic.compat.jei.CompatibilityJustEnoughItems; import WayofTime.bloodmagic.compat.jei.CompatibilityJustEnoughItems;
import WayofTime.bloodmagic.compat.waila.CompatibilityWaila;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import java.util.ArrayList; import java.util.ArrayList;
@ -14,7 +13,7 @@ public class ModCompatibility
public static void registerModCompat() public static void registerModCompat()
{ {
compatibilities.add(new CompatibilityJustEnoughItems()); compatibilities.add(new CompatibilityJustEnoughItems());
compatibilities.add(new CompatibilityWaila()); // compatibilities.add(new CompatibilityWaila());
// compatibilities.add(new CompatibilityThaumcraft()); // compatibilities.add(new CompatibilityThaumcraft());
// compatibilities.add(new CompatibilityGuideAPI()); // compatibilities.add(new CompatibilityGuideAPI());
} }