From bdea159d41d699eb4cacd2d011c8874a06f3bfcd Mon Sep 17 00:00:00 2001 From: King Lemming Date: Fri, 22 Dec 2017 10:45:30 -0500 Subject: [PATCH] Adjustments to recipes, bump version. (No build yet.) Signed-off-by: King Lemming --- build.gradle | 2 +- build.properties | 2 +- src/main/java/cofh/CoFHCore.java | 2 +- .../cofh/core/util/crafting/FluidIngredientFactory.java | 6 ++++++ .../cofh/core/util/crafting/ShapedUpgradeRecipeFactory.java | 6 ++++++ .../core/util/crafting/ShapelessFluidRecipeFactory.java | 6 ++++++ .../util/crafting/ShapelessUpgradeKitRecipeFactory.java | 6 ++++++ 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e4ca299a..a10c3afc 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") ?: "1") +version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "26") println config.mc_version + "-" + config.forge_version // Setup the Forge/Minecraft plugin data. Specify the preferred Forge/Minecraft version here. diff --git a/build.properties b/build.properties index f5550ae1..840475be 100644 --- a/build.properties +++ b/build.properties @@ -4,7 +4,7 @@ forge_version=14.23.1.2555 mappings=snapshot_20171003 # Mod Version -mod_version=4.3.7 +mod_version=4.3.8 # Dependencies rf_mc_version=1.12 diff --git a/src/main/java/cofh/CoFHCore.java b/src/main/java/cofh/CoFHCore.java index 0cd79604..d3a1fbef 100644 --- a/src/main/java/cofh/CoFHCore.java +++ b/src/main/java/cofh/CoFHCore.java @@ -38,7 +38,7 @@ public class CoFHCore { public static final String MOD_ID = "cofhcore"; public static final String MOD_NAME = "CoFH Core"; - public static final String VERSION = "4.3.7"; + public static final String VERSION = "4.3.8"; public static final String VERSION_MAX = "4.4.0"; public static final String VERSION_GROUP = "required-after:" + MOD_ID + "@[" + VERSION + "," + VERSION_MAX + ");"; public static final String UPDATE_URL = "https://raw.github.com/cofh/version/master/" + MOD_ID + "_update.json"; diff --git a/src/main/java/cofh/core/util/crafting/FluidIngredientFactory.java b/src/main/java/cofh/core/util/crafting/FluidIngredientFactory.java index 66c024f6..bb84a7f5 100644 --- a/src/main/java/cofh/core/util/crafting/FluidIngredientFactory.java +++ b/src/main/java/cofh/core/util/crafting/FluidIngredientFactory.java @@ -54,6 +54,12 @@ public boolean apply(@Nullable ItemStack input) { } return false; } + + @Override + public boolean isSimple() { + + return false; + } } } diff --git a/src/main/java/cofh/core/util/crafting/ShapedUpgradeRecipeFactory.java b/src/main/java/cofh/core/util/crafting/ShapedUpgradeRecipeFactory.java index 5b973cd0..156e1888 100644 --- a/src/main/java/cofh/core/util/crafting/ShapedUpgradeRecipeFactory.java +++ b/src/main/java/cofh/core/util/crafting/ShapedUpgradeRecipeFactory.java @@ -71,6 +71,12 @@ public ItemStack getCraftingResult(@Nonnull InventoryCrafting inv) { } return outputStack; } + + @Override + public boolean isDynamic() { + + return true; + } } } diff --git a/src/main/java/cofh/core/util/crafting/ShapelessFluidRecipeFactory.java b/src/main/java/cofh/core/util/crafting/ShapelessFluidRecipeFactory.java index 7600e860..7b515e4f 100644 --- a/src/main/java/cofh/core/util/crafting/ShapelessFluidRecipeFactory.java +++ b/src/main/java/cofh/core/util/crafting/ShapelessFluidRecipeFactory.java @@ -51,6 +51,12 @@ public NonNullList getRemainingItems(InventoryCrafting inv) { } return ret; } + + @Override + public boolean isDynamic() { + + return true; + } } } diff --git a/src/main/java/cofh/core/util/crafting/ShapelessUpgradeKitRecipeFactory.java b/src/main/java/cofh/core/util/crafting/ShapelessUpgradeKitRecipeFactory.java index 230355b7..262f7fd9 100644 --- a/src/main/java/cofh/core/util/crafting/ShapelessUpgradeKitRecipeFactory.java +++ b/src/main/java/cofh/core/util/crafting/ShapelessUpgradeKitRecipeFactory.java @@ -72,6 +72,12 @@ public ItemStack getCraftingResult(@Nonnull InventoryCrafting inv) { } return AugmentHelper.setLevel(outputStack, upgradeLevel); } + + @Override + public boolean isDynamic() { + + return true; + } } }