diff --git a/build.gradle b/build.gradle index 88b30f03..620d5e58 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { diff --git a/gradle.properties b/gradle.properties index 65a7614b..878b0bb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,5 @@ curse_id=224791 mappings_version=snapshot_20151128 -jei_version=2.13.0.52 \ No newline at end of file +jei_version=2.13.0.52 +waila_version=1.6.0-B3 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 90c396a6..861dd353 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -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(); } diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index 70669c5b..1993245b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java index 3bd4ddbc..857715bf 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java @@ -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) { diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 802ba6c4..02753546 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -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. \ No newline at end of file +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