From 369e02712d756b001e8c60cf19fea145ebf0ddef Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Mon, 1 Oct 2018 18:19:27 -0400 Subject: [PATCH] push fixes and version updates --- kfc/To-Dos.md | 3 ++- kfc/gradle.properties | 2 +- .../main/java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../compat/JEI/anvil/AnvilRecipeCategory.java | 7 ++++++- .../nmd/primal/forgecraft/util/AnvilHandler.java | 5 +++++ .../resources/assets/forgecraft/textures/logo.png | Bin 0 -> 376 bytes kfc/src/main/resources/mcmod.info | 2 +- 7 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/logo.png diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index 2c369508..9322b9bb 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -3,10 +3,11 @@ ## Bugs ## Current Feature +- [ ] Craft Tweaker Support - [ ] Config to map only wrought iron to vanilla iron or wrought iron to another iron - [ ] Copper Gladius -- [ ] Craft Tweaker Support - [ ] oreDict support for Forge Recipes +- [ ] drop a tool handle when crafting ## Feature Musket - [ ] Create powder charge item (copper, charcoal, gunpowder) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index c28b72ec..ca197ae9 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.6.15 +mod_version=1.6.17 forge_version=14.23.4.2744 mcp_mappings=snapshot_20171003 mc_version=1.12.2 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index 7923ccb9..759fe8ff 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -18,7 +18,7 @@ public class ModInfo { //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.6.15"; + public static final String MOD_VERSION = "1.6.17"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java index 9bf0c8ba..1ec7e1a5 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java @@ -13,6 +13,7 @@ import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.compat.JEI.AbstractCategory; import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.items.parts.ToolPart; import javax.annotation.Nonnull; @@ -98,7 +99,11 @@ public class AnvilRecipeCategory extends AbstractCategory //items.set(0, recipe.getIngredient(0)); for(int i =0; i < 25; i++){ - items.set(i, recipe.getIngredient(i)); + if(recipe.getIngredient(i).getItem() instanceof ToolPart) { + items.set(i, new ItemStack(recipe.getIngredient(i).getItem(), 1)); + } else { + items.set(i, recipe.getIngredient(i)); + } } /***OUTPUTS***/ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java index a98e07c1..640d8cc3 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java @@ -101,6 +101,11 @@ public interface AnvilHandler extends ToolMaterialMap { if (recipe.getUpgrade() == "repair") { CommonUtils.spawnItemEntityFromWorld(world, pos, outputStack); + for (int i = 0; i < tile.getSlotListSize(); i++) { + if (!tile.getSlotStack(i).isEmpty()) { + tile.setSlotStack(i, ItemStack.EMPTY); + } + } return true; } diff --git a/kfc/src/main/resources/assets/forgecraft/textures/logo.png b/kfc/src/main/resources/assets/forgecraft/textures/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..50848f8676d98cc4fbb5c349c87cf5a5ae61fbd5 GIT binary patch literal 376 zcmV-;0f+vHP)pC?}liIe8*!TNQ z!!V?6+tPjC>3N;&nW|v8nXeQYbhur5+ezpI48Pf zz5qc9fa-Q#7e&;B7*>uO45$o<0H>7cK$5~5w*eLm_#xGGUDG&@p*jgB$p&n>2O%N> z5}Y5O7|fuqMi_oMR$!b5I)a&#lQHZB3wMD;h0cI@BA<{1E`LRH*)Z5L-m)wy1F(yt zm9z!(LT+oxG^?gSRR<&+%6+>Q literal 0 HcmV?d00001 diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index b281dbae..31ebf5ec 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.6.15", + "version": "1.6.17", "mcversion": "1.12.2", "url": "", "updateUrl": "",