diff --git a/kfc/gradle.properties b/kfc/gradle.properties index ae831ffa..830698d2 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.26 +mod_version=1.6.28 forge_version=14.23.4.2765 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 567edcd3..ddc5763c 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -22,7 +22,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.26"; + public static final String MOD_VERSION = "1.6.28"; 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/blocks/machine/Workbench.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Workbench.java index 11f2c799..d1c4ebcd 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Workbench.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Workbench.java @@ -104,6 +104,7 @@ public class Workbench extends CustomContainerFacing { tile.clearSlot(3); tile.clearSlot(4); tile.clearSlot(5); + playerStack.damageItem(1, player); return true; } } @@ -113,12 +114,14 @@ public class Workbench extends CustomContainerFacing { ItemStack drops = recipe.getOutput(); if (slot5.hasTagCompound()) { drops.setTagCompound(slot5.getTagCompound()); + drops.setItemDamage(slot5.getItemDamage()); } PlayerHelper.spawnItemOnPlayer(world, player, drops); tile.clearSlot(2); tile.clearSlot(3); tile.clearSlot(4); tile.clearSlot(5); + playerStack.damageItem(1, player); return true; } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesWorkbench.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesWorkbench.java index 05bdca64..acd89ac4 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesWorkbench.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesWorkbench.java @@ -6,6 +6,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreIngredient; import net.minecraftforge.registries.IForgeRegistry; import nmd.primal.core.api.PrimalAPI; @@ -13,6 +14,8 @@ import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.crafting.WorkbenchCrafting; import nmd.primal.forgecraft.init.ModItems; +import java.lang.reflect.WildcardType; + @GameRegistry.ObjectHolder(ModInfo.MOD_ID) @Mod.EventBusSubscriber public final class RecipesWorkbench { @@ -34,7 +37,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.copperaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.copperaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.copperaxehead, 1)).setRecipeName("copperaxesplit")); recipes.register (new WorkbenchCrafting( @@ -48,7 +51,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.copperhoe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.copperhoe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.copperhoehead, 1)).setRecipeName("copperhoesplit")); recipes.register (new WorkbenchCrafting( @@ -62,7 +65,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.copperpickaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.copperpickaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.copperpickaxehead, 1)).setRecipeName("copperpickaxesplit")); recipes.register (new WorkbenchCrafting( @@ -76,7 +79,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.coppershovel, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.coppershovel, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.coppershovelhead, 1)).setRecipeName("coppershovelsplit")); /***BRONZE***/ @@ -92,7 +95,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.bronzeaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.bronzeaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.bronzeaxehead, 1)).setRecipeName("bronzeaxesplit")); recipes.register (new WorkbenchCrafting( @@ -106,7 +109,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.bronzehoe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.bronzehoe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.bronzehoehead, 1)).setRecipeName("bronzehoesplit")); recipes.register (new WorkbenchCrafting( @@ -120,7 +123,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.bronzepickaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.bronzepickaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.bronzepickaxehead, 1)).setRecipeName("bronzepickaxesplit")); recipes.register (new WorkbenchCrafting( @@ -134,7 +137,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.bronzeshovel, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.bronzeshovel, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.bronzeshovelhead, 1)).setRecipeName("bronzeshovelsplit")); @@ -151,7 +154,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.ironaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.ironaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.ironaxehead, 1)).setRecipeName("ironaxesplit")); recipes.register (new WorkbenchCrafting( @@ -165,7 +168,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.ironhoe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.ironhoe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.ironhoehead, 1)).setRecipeName("ironhoesplit")); recipes.register (new WorkbenchCrafting( @@ -179,7 +182,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.ironpickaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.ironpickaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.pickaxehead, 1)).setRecipeName("ironpickaxesplit")); recipes.register (new WorkbenchCrafting( @@ -193,7 +196,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.ironshovel, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.ironshovel, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.ironshovelhead, 1)).setRecipeName("ironshovelsplit")); @@ -210,7 +213,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.cleanironaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.cleanironaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.cleanironaxehead, 1)).setRecipeName("cleanironaxesplit")); recipes.register (new WorkbenchCrafting( @@ -224,7 +227,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.cleanironhoe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.cleanironhoe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.cleanironhoehead, 1)).setRecipeName("cleanironhoesplit")); recipes.register (new WorkbenchCrafting( @@ -238,7 +241,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.cleanironpickaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.cleanironpickaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.cleanironpickaxehead, 1)).setRecipeName("cleanironpickaxesplit")); recipes.register (new WorkbenchCrafting( @@ -252,7 +255,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.cleanironshovel, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.cleanironshovel, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.cleanironshovelhead, 1)).setRecipeName("cleanironshovelsplit")); @@ -269,7 +272,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.steelaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.steelaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.steelaxehead, 1)).setRecipeName("steelaxesplit")); recipes.register (new WorkbenchCrafting( @@ -283,7 +286,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.steelhoe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.steelhoe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.steelhoehead, 1)).setRecipeName("steelhoesplit")); recipes.register (new WorkbenchCrafting( @@ -297,7 +300,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.steelpickaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.steelpickaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.steelpickaxehead, 1)).setRecipeName("steelpickaxesplit")); recipes.register (new WorkbenchCrafting( @@ -311,7 +314,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.steelshovel, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.steelshovel, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.steelshovelhead, 1)).setRecipeName("steelshovelsplit")); @@ -328,7 +331,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.wootzaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.wootzaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.wootzaxehead, 1)).setRecipeName("wootzaxesplit")); recipes.register (new WorkbenchCrafting( @@ -342,7 +345,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.wootzhoe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.wootzhoe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.wootzhoehead, 1)).setRecipeName("wootzhoesplit")); recipes.register (new WorkbenchCrafting( @@ -356,7 +359,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.wootzpickaxe, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.wootzpickaxe, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.wootzpickaxehead, 1)).setRecipeName("wootzpickaxesplit")); recipes.register (new WorkbenchCrafting( @@ -370,7 +373,7 @@ public final class RecipesWorkbench { Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(ModItems.wootzshovel, 1)), + Ingredient.fromStacks(new ItemStack(ModItems.wootzshovel, 1, OreDictionary.WILDCARD_VALUE)), new ItemStack(ModItems.wootzshovelhead, 1)).setRecipeName("wootzshovelsplit")); } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 0d83c21b..32fdc106 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -343,6 +343,8 @@ public class ModCrafting{ RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.stoneanvil, 1), " ", " I ", " S ", 'I', "ingotIron", 'S', Blocks.STONE); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.workbench, 1), + "ss ", "rrr", "f f", 's', "slabWood", 'r', Blocks.STONE_SLAB, 'f', "fenceWood"); /****************************************************************************** CASTING diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index d8c0d54c..2d6352ac 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.26", + "version": "1.6.28", "mcversion": "1.12.2", "url": "", "updateUrl": "",