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

WAILA compatibility

Browse source 
Currently has handlers for Teleposers and Blood Altars
This commit is contained in:
Nick 2016-01-01 15:40:04 -08:00
parent 318e3a03c7
commit cb929a93b6
6 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.gradle
View file

@ -37,10 +37,15 @@ if (new File(projectDir, '.git').exists())
repositories {
maven { url "http://dvs1.progwml6.com/files/maven" }
maven { url "http://mobiusstrip.eu/maven" }
}
dependencies {
deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
compile ("mcp.mobius.waila:Waila:${waila_version}_1.8.8:dev") {
exclude group: 'mcp.mobius.waila'
}
}
minecraft {

3
gradle.properties
View file

@ -7,4 +7,5 @@ curse_id=224791
mappings_version=snapshot_20151128
jei_version=2.13.0.52
jei_version=2.13.0.52
waila_version=1.6.0-B3

2
src/main/java/WayofTime/bloodmagic/ConfigHandler.java
View file

@ -89,6 +89,7 @@ public class ConfigHandler
public static boolean vanillaPotionAbsorptionEnabled;
// Compat
public static int wailaAltarDisplayMode;
public static void init(File file)
{
@ -178,6 +179,7 @@ public class ConfigHandler
category = "Compatibility";
config.addCustomCategoryComment(category, "Compatibility settings");
wailaAltarDisplayMode = config.getInt("wailaAltarDisplayMode", category + ".waila", 1, 0, 2, "The mode for the Waila display on Blood Altars.\n0 - Always display information\n1 - Only display when Divination/Seer sigil is in hand.\n2 - Only display when Divination/Seer sigil is in inventory");
config.save();
}

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

@ -29,6 +29,7 @@ public class Constants
public static final String INPUT_AMOUNT = "inputAmount";
public static final String STORED_LP = "storedLP";
public static final String ALTAR = "bloodAltar";
public static final String ALTAR_TIER = "upgradeLevel";
public static final String ALTAR_ACTIVE = "isActive";
public static final String ALTAR_LIQUID_REQ = "liquidRequired";
@ -87,6 +88,10 @@ public class Constants
public static final String JEI_CATEGORY_ALTAR = Mod.MODID + ":altar";
public static final String JEI_CATEGORY_BINDING = Mod.MODID + ":binding";
public static final String JEI_CATEGORY_ALCHEMYARRAY = Mod.MODID + ":alchemyArray";
public static final String WAILA_CONFIG_BYPASS_SNEAK = Mod.MODID + ".bypassSneak";
public static final String WAILA_CONFIG_ALTAR = Mod.MODID + ".bloodAltar";
public static final String WAILA_CONFIG_TELEPOSER = Mod.MODID + ".teleposer";
}
public static class Misc

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

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

9
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -170,6 +170,7 @@ tooltip.BloodMagic.sigil.fastMiner.desc=&oKeep mining, and mining...
tooltip.BloodMagic.sigil.elementalAffinity.desc=&oFalling fire fishes!
tooltip.BloodMagic.sigil.seer.desc=&oWhen seeing all is not enough
tooltip.BloodMagic.sigil.seer.currentAltarProgress=Current Progress: %d LP/ %s LP
tooltip.BloodMagic.sigil.seer.currentAltarProgress.percent=Current Progress: %s
tooltip.BloodMagic.sigil.seer.currentAltarConsumptionRate=Consumption Rate: %d LP
tooltip.BloodMagic.sigil.seer.currentAltarTier=Current Tier: %d
tooltip.BloodMagic.sigil.seer.currentEssence=Current Essence: %d LP
@ -240,4 +241,10 @@ jei.BloodMagic.recipe.alchemyArrayCrafting=Alchemy Array
jei.BloodMagic.recipe.requiredLP=LP: %d
jei.BloodMagic.recipe.requiredTier=Tier: %d
jei.BloodMagic.desc.altarBuilder=A creative-only item for use in debugging and testing.\n\nShift + Right click to change the tier to build. Right click an Altar to initiate the build.\n\nBreak an Altar while holding to dismantle it.
jei.BloodMagic.desc.altarBuilder=A creative-only item for use in debugging and testing.\n\nShift + Right click to change the tier to build. Right click an Altar to initiate the build.\n\nBreak an Altar while holding to dismantle it.
# WAILA
waila.BloodMagic.sneak=&oSneak for Information
option.BloodMagic.bypassSneak=Bypass Sneak
option.BloodMagic.bloodAltar=Blood Altar
option.BloodMagic.teleposer=Teleposer