From a5c468ad7347d133e28e95c858468f04b38131fb Mon Sep 17 00:00:00 2001 From: King Lemming Date: Sun, 24 Dec 2017 12:29:17 -0500 Subject: [PATCH] 4.3.8 release. :) Signed-off-by: King Lemming --- build.gradle | 2 +- src/main/java/cofh/core/enchantment/EnchantmentHolding.java | 6 ++++++ src/main/java/cofh/core/enchantment/EnchantmentInsight.java | 6 ++++++ src/main/java/cofh/core/enchantment/EnchantmentLeech.java | 6 ++++++ .../java/cofh/core/enchantment/EnchantmentMultishot.java | 6 ++++++ .../java/cofh/core/enchantment/EnchantmentSmelting.java | 6 ++++++ src/main/java/cofh/core/enchantment/EnchantmentVorpal.java | 6 ++++++ src/main/java/cofh/core/util/helpers/HolidayHelper.java | 6 +++--- 8 files changed, 40 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a10c3afc..db907af2 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { compile "mezz.jei:jei_${config.jei_mc_version}:${config.jei_version}" } -version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "26") +version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "27") println config.mc_version + "-" + config.forge_version // Setup the Forge/Minecraft plugin data. Specify the preferred Forge/Minecraft version here. diff --git a/src/main/java/cofh/core/enchantment/EnchantmentHolding.java b/src/main/java/cofh/core/enchantment/EnchantmentHolding.java index 1dd97797..b64a0654 100644 --- a/src/main/java/cofh/core/enchantment/EnchantmentHolding.java +++ b/src/main/java/cofh/core/enchantment/EnchantmentHolding.java @@ -54,4 +54,10 @@ public boolean canApplyAtEnchantingTable(ItemStack stack) { return canApply(stack); } + @Override + public boolean isAllowedOnBooks() { + + return enable; + } + } diff --git a/src/main/java/cofh/core/enchantment/EnchantmentInsight.java b/src/main/java/cofh/core/enchantment/EnchantmentInsight.java index 0e689640..e1b7aaf2 100644 --- a/src/main/java/cofh/core/enchantment/EnchantmentInsight.java +++ b/src/main/java/cofh/core/enchantment/EnchantmentInsight.java @@ -63,4 +63,10 @@ public boolean canApplyTogether(Enchantment ench) { return super.canApplyTogether(ench) && ench != Enchantments.SILK_TOUCH; } + @Override + public boolean isAllowedOnBooks() { + + return enable; + } + } diff --git a/src/main/java/cofh/core/enchantment/EnchantmentLeech.java b/src/main/java/cofh/core/enchantment/EnchantmentLeech.java index 6914a54b..e0042827 100644 --- a/src/main/java/cofh/core/enchantment/EnchantmentLeech.java +++ b/src/main/java/cofh/core/enchantment/EnchantmentLeech.java @@ -56,4 +56,10 @@ public boolean canApplyAtEnchantingTable(ItemStack stack) { return canApply(stack); } + @Override + public boolean isAllowedOnBooks() { + + return enable; + } + } diff --git a/src/main/java/cofh/core/enchantment/EnchantmentMultishot.java b/src/main/java/cofh/core/enchantment/EnchantmentMultishot.java index ffcd8210..1a503bc8 100644 --- a/src/main/java/cofh/core/enchantment/EnchantmentMultishot.java +++ b/src/main/java/cofh/core/enchantment/EnchantmentMultishot.java @@ -55,4 +55,10 @@ public boolean canApplyAtEnchantingTable(ItemStack stack) { return canApply(stack); } + @Override + public boolean isAllowedOnBooks() { + + return enable; + } + } diff --git a/src/main/java/cofh/core/enchantment/EnchantmentSmelting.java b/src/main/java/cofh/core/enchantment/EnchantmentSmelting.java index dc47d739..2d0c93e6 100644 --- a/src/main/java/cofh/core/enchantment/EnchantmentSmelting.java +++ b/src/main/java/cofh/core/enchantment/EnchantmentSmelting.java @@ -62,4 +62,10 @@ public boolean canApplyTogether(Enchantment ench) { return super.canApplyTogether(ench) && ench != Enchantments.SILK_TOUCH; } + @Override + public boolean isAllowedOnBooks() { + + return enable; + } + } diff --git a/src/main/java/cofh/core/enchantment/EnchantmentVorpal.java b/src/main/java/cofh/core/enchantment/EnchantmentVorpal.java index cc258528..91ebd554 100644 --- a/src/main/java/cofh/core/enchantment/EnchantmentVorpal.java +++ b/src/main/java/cofh/core/enchantment/EnchantmentVorpal.java @@ -59,4 +59,10 @@ public boolean canApplyAtEnchantingTable(ItemStack stack) { return canApply(stack); } + @Override + public boolean isAllowedOnBooks() { + + return enable; + } + } diff --git a/src/main/java/cofh/core/util/helpers/HolidayHelper.java b/src/main/java/cofh/core/util/helpers/HolidayHelper.java index 13b90628..e453cdba 100644 --- a/src/main/java/cofh/core/util/helpers/HolidayHelper.java +++ b/src/main/java/cofh/core/util/helpers/HolidayHelper.java @@ -158,10 +158,10 @@ public static boolean isUSThanksgiving() { return dateCheck(); } - public static boolean isChristmas() { + public static boolean isChristmas(int pre, int post) { - setDate(holidayStart, Calendar.DECEMBER, 24, false); - setDate(holidayEnd, Calendar.DECEMBER, 26, true); + setDate(holidayStart, Calendar.DECEMBER, 24 - pre, false); + setDate(holidayEnd, Calendar.DECEMBER, 26 + post, true); return dateCheck(); }