From 20d4cf179dde2d212b19f9880a7ee6e6551ca8ef Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Thu, 30 Mar 2017 21:34:53 -0400 Subject: [PATCH] fixed primal dependency and added new tool material types --- 1.11/To-Dos | 5 +-- 1.11/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 5 +-- .../nmd/primal/forgecraft/init/ModItems.java | 18 ++++----- .../primal/forgecraft/init/ModMaterials.java | 15 ++++++++ .../items/weapons/CustomShield.java | 37 +++++++++++++++++++ 1.11/src/main/resources/mcmod.info | 2 +- 7 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/init/ModMaterials.java create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java diff --git a/1.11/To-Dos b/1.11/To-Dos index f2301ca4..1e1a5e6f 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -7,12 +7,11 @@ To-Dos - [ ] Remove hot or cool ingots and tool heads from inventories - [ ] Add Iron Ring Recipe - [ ] Add chainmail recipe -- [ ] Add Iron Shield Recipe +- [ ] Add Iron Shield - [x] Tool Disassembly - [x] Tool Repair - [ ] Gold Smelting -- [ ] Custom Tool Material -- [ ] Add Iron to to Empty Crucible via right click +- [x] Custom Tool Material - [ ] Coal is not being removed from the forge or firebox *** Backlog *** diff --git a/1.11/gradle.properties b/1.11/gradle.properties index a3a0e940..a9590c45 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.2.06 +mod_version=1.2.07 forge_version=13.20.0.2226 mcp_mappings=snapshot_20161220 mc_version=1.11.2 diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index 932298db..d4615fc9 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,10 +17,9 @@ public class ModInfo { public static final String MOD_NAME = "Kitsu's ForgeCraft"; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.2.06"; + public static final String MOD_VERSION = "1.2.07"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; - public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);" - + "after:primal;"; + public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);" + "required-after:primal;"; /** Mod Structures **/ public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 86dccb6a..edc2918b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -62,17 +62,17 @@ public class ModItems { softcrucible = new ItemSoftCrucible(); stonetongs = new ItemStoneTongs("stonetongs"); - pickaxehead = new ToolPart("ironpickaxehead", Item.ToolMaterial.IRON); - ironaxehead = new ToolPart("ironaxehead", Item.ToolMaterial.IRON); - ironshovelhead = new ToolPart("ironshovelhead", Item.ToolMaterial.IRON); - ironhoehead = new ToolPart("ironhoehead", Item.ToolMaterial.IRON); + pickaxehead = new ToolPart("ironpickaxehead", ModMaterials.TOOL_WROUGHT_IRON); + ironaxehead = new ToolPart("ironaxehead", ModMaterials.TOOL_WROUGHT_IRON); + ironshovelhead = new ToolPart("ironshovelhead", ModMaterials.TOOL_WROUGHT_IRON); + ironhoehead = new ToolPart("ironhoehead", ModMaterials.TOOL_WROUGHT_IRON); - ironpickaxe = new CustomPickaxe("ironpickaxe", Item.ToolMaterial.IRON); - ironaxe = new CustomAxe("ironaxe", Item.ToolMaterial.IRON); - ironshovel = new CustomShovel("ironshovel", Item.ToolMaterial.IRON); - ironhoe = new CustomHoe("ironhoe", Item.ToolMaterial.IRON); + ironpickaxe = new CustomPickaxe("ironpickaxe", ModMaterials.TOOL_WROUGHT_IRON); + ironaxe = new CustomAxe("ironaxe", ModMaterials.TOOL_WROUGHT_IRON); + ironshovel = new CustomShovel("ironshovel", ModMaterials.TOOL_WROUGHT_IRON); + ironhoe = new CustomHoe("ironhoe", ModMaterials.TOOL_WROUGHT_IRON); - ironsword = new CustomSword("ironsword", Item.ToolMaterial.IRON); + ironsword = new CustomSword("ironsword", ModMaterials.TOOL_WROUGHT_IRON); //ironingotballcool = new BaseMultiItem("ironingotcool") {}; //test = new ItemTest("ironsword"); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModMaterials.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModMaterials.java new file mode 100644 index 00000000..1279afc6 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModMaterials.java @@ -0,0 +1,15 @@ +package nmd.primal.forgecraft.init; + +import net.minecraft.item.Item; +import net.minecraftforge.common.util.EnumHelper; + +/** + * Created by mminaie on 3/30/17. + */ +public class ModMaterials { + + public static Item.ToolMaterial TOOL_WROUGHT_IRON = EnumHelper.addToolMaterial("wroughiron", 2, 500, 2.0F, 1.0F, 0); + public static Item.ToolMaterial CLEAN_IRON = EnumHelper.addToolMaterial("cleaniron", 2, 700, 3.0F, 3.0F, 0); + public static Item.ToolMaterial BASIC_STEEL = EnumHelper.addToolMaterial("steelbasic", 3, 900, 5.0F, 5.0F, 0); + public static Item.ToolMaterial WOOTZ_STEEL = EnumHelper.addToolMaterial("wootzsteel", 3, 1100, 7.0F, 7.0F, 0); +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java new file mode 100644 index 00000000..1e55f47e --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java @@ -0,0 +1,37 @@ +package nmd.primal.forgecraft.items.weapons; + +import net.minecraft.block.BlockDispenser; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.IItemPropertyGetter; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemShield; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +/** + * Created by mminaie on 3/30/17. + */ +public class CustomShield extends ItemShield { + + public CustomShield() + { + this.maxStackSize = 1; + this.setCreativeTab(CreativeTabs.COMBAT); + this.setMaxDamage(336); + this.addPropertyOverride(new ResourceLocation("blocking"), new IItemPropertyGetter() + { + @SideOnly(Side.CLIENT) + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) + { + return entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F; + } + }); + } + +} diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info index 991ba19c..f9163639 100644 --- a/1.11/src/main/resources/mcmod.info +++ b/1.11/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.2.06", + "version": "1.2.07", "mcversion": "1.11.2", "url": "", "updateUrl": "",