From aba73035b596d40e5e2f7923c8ba7b89d46a2d66 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 25 Mar 2017 14:46:44 -0400 Subject: [PATCH] updated crafting and lang files --- 1.11/To-Dos | 2 ++ 1.11/gradle.properties | 2 +- 1.11/hs_err_pid57520.log | 0 .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../primal/forgecraft/init/ModCrafting.java | 34 +++++++++++++++++-- .../assets/forgecraft/lang/en_us.lang | 31 +++++++++++++++-- 1.11/src/main/resources/mcmod.info | 2 +- 7 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 1.11/hs_err_pid57520.log diff --git a/1.11/To-Dos b/1.11/To-Dos index cf36abc9..52e75ed4 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -4,6 +4,8 @@ To-Dos - [ ] OreDict Stuff - [ ] Use Primal Brick instead of clay brick +- [ ] Iron Plate Recipe +- [ ] Bucket Crafting *** Backlog *** - [ ] Create a method which adds the types of NBT upgrades and creates a unique float instead of using magic numbers diff --git a/1.11/gradle.properties b/1.11/gradle.properties index c3d6d14b..888c476f 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.00 +mod_version=1.2.01 forge_version=13.20.0.2226 mcp_mappings=snapshot_20161220 mc_version=1.11.2 diff --git a/1.11/hs_err_pid57520.log b/1.11/hs_err_pid57520.log new file mode 100644 index 00000000..e69de29b 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 012e5e1b..ae617343 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,7 +17,7 @@ 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.00"; + public static final String MOD_VERSION = "1.2.01"; 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;"; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 7eabf563..0e2b3a85 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -36,6 +36,14 @@ public class ModCrafting { GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery), "X X", "X X", "XXX", 'X', Items.BRICK); + /*** Soft Crucible ***/ + GameRegistry.addShapedRecipe(new ItemStack(ModItems.softcrucible), + "X X", "X X", "XXX", 'X', Items.CLAY_BALL); + + /*** Soft Crucible ***/ + GameRegistry.addShapedRecipe(new ItemStack(ModItems.softcrucible), + "X X", "X X", "XXX", 'X', PrimalItems.MUD_CLUMP); + /***Wooden PistonBellows***/ GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsoak), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 0), 'Y', ModItems.pistonbellows); @@ -71,8 +79,6 @@ public class ModCrafting { GameRegistry.addShapedRecipe(iron0, " X ", " Y ", 'X', Blocks.IRON_ORE, 'Y', ModBlocks.emptycrucible); - //Iron Ore speed +1 - /***Pickaxe Crafting***/ GameRegistry.addShapedRecipe(new ItemStack(ModItems.ironpickaxe, 1), " X ", " Y ", 'X', ModItems.pickaxehead, 'Y', Items.STICK); @@ -260,6 +266,30 @@ public class ModCrafting { "null" ); + /*** Bucket ***/ + AnvilCrafting.addRecipe( + new String [] { + empty,empty,empty,empty,empty, + empty,hotChunk,empty,hotChunk,empty, + empty,hotChunk,empty,hotChunk,empty, + empty,empty,hotChunk,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(Items.BUCKET, 1), + "null" + ); + + /*** Primal Plate ***/ + AnvilCrafting.addRecipe( + new String [] { + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty, + empty,hotChunk,hotChunk,empty,empty, + empty,hotChunk,hotChunk,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(PrimalItems.IRON_PLATE, 1), + "null" + ); + /*** Flaked diamond ***/ AnvilCrafting.addRecipe( new String[] { diff --git a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang index e10da8ba..7221774f 100644 --- a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -1,7 +1,34 @@ itemGroup.forgecraft=ForgeCraft -item.test.name=test -item.pistonbellows=Bellows Handle tile.firebox.name=Forge +tile.bloomery.name=Bloomery tile.pistonbellows.name=Wooden Piston Bellows +tile.emptycrucible.name=Empty Crucible +tile.emptycruciblehit.name=Hot Empty Crucible +tile.emptycruciblecracked.name= Cracked Empty Crucible +tile.emptycruciblecrackedhot.name=Cracked Hot Empty Crucible +tile.rawironcrucible.name=Filled Iron Crucible +tile.hotironcrucible.name=Hot Iron Crucible +tile.hotcookedironcrucible.name=Hot Cooked Iron Crucible +tile.coolironcrucible.name=Cool Iron Crucible +tile.failedironcrucible.name=Failed Iron Crucible +tile.failedironcruciblehot.name=Failed Iron Crucible Hot +tile.ironball.name=Raw Iron Ingot +tile.ironchunk.name=Iron Chunk + +item.bellowshandle.name=Bellows Handle +item.softcrucible.name=Soft Crucible +item.stonetongs.name=Stone Tongs +item.forgehammer.name=Forge Hammer +item.ironingothot.name=Iron Ingot Hot +item.ironchunkhot.name=Iron Chunk Hot +item.ironpickaxehead.name=Iron Pickaxe Head +item.ironaxehead.name=Iron Axe Head +item.ironshovelhead.name=Iron Shovel Head +item.ironhoehead.name=Iron Hoe Head +item.ironpickaxe.name=Iron Pickaxe +item.ironaxe.name=Iron Axe +item.ironshovel.name=Iron Shovel +item.ironhoe.name=Iron Hoe +item.ironsword.name=Iron Sword \ No newline at end of file diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info index 6804a880..5b7318fc 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.00", + "version": "1.2.01", "mcversion": "1.11.2", "url": "", "updateUrl": "",