4.3.8 release. :)

Signed-off-by: King Lemming <kinglemming@gmail.com>
CoFH · Dec 24, 2017 · a5c468a · a5c468a
1 parent bdea159
commit a5c468a
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();
  }