From 226eb7a62f56a95e68d8f72bc40d611c4cfd3ce2 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Mon, 3 Jul 2017 20:26:37 -0400 Subject: [PATCH] fixing stonetongs bug unable to replicate switching all state flags to 2 --- kfc/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../forgecraft/items/ItemStoneTongs.java | 54 +++++++++---------- kfc/src/main/resources/mcmod.info | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index c27cf0a7..da130350 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.2.60 +mod_version=1.2.61 forge_version=13.20.0.2315 mcp_mappings=snapshot_20170121 mc_version=1.11.2 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index e52df7f8..5e0840c2 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,7 +17,7 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.2.60"; + public static final String MOD_VERSION = "1.2.61"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2315,);" + "required-after:primal@[0.4,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index ba6e6a22..6afc1966 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -371,46 +371,46 @@ public class ItemStoneTongs extends Item { case 0: break; case 1: - world.setBlockState(tempPos, ModBlocks.emptycruciblehot.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.emptycruciblehot.getDefaultState(), 2); TileBaseCrucible tileCrucible1 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible1.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 2: - world.setBlockState(tempPos, ModBlocks.emptycruciblecrackedhot.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.emptycruciblecrackedhot.getDefaultState(), 2); TileBaseCrucible tileCrucible2 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible2.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 3: - world.setBlockState(tempPos, ModBlocks.hotironcrucible.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotironcrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible3 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible3.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 4: - world.setBlockState(tempPos, ModBlocks.hotcookedironcrucible.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedironcrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible4 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible4.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 5: - world.setBlockState(tempPos, ModBlocks.failedironcruciblehot.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.failedironcruciblehot.getDefaultState(), 2); TileBaseCrucible tileCrucible5 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible5.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 6: - world.setBlockState(tempPos, ModBlocks.ironball.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); + world.setBlockState(tempPos, ModBlocks.ironball.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 2); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 7: - world.setBlockState(tempPos, ModBlocks.ironchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); + world.setBlockState(tempPos, ModBlocks.ironchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 2); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 8: @@ -422,7 +422,7 @@ public class ItemStoneTongs extends Item { case 11: return EnumActionResult.FAIL; case 12: - world.setBlockState(tempPos, ModBlocks.hotcleanironcrucible.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcleanironcrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible12 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible12.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); @@ -436,18 +436,18 @@ public class ItemStoneTongs extends Item { itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 14: - world.setBlockState(tempPos, ModBlocks.failedcleanironcruciblehot.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.failedcleanironcruciblehot.getDefaultState(), 2); TileBaseCrucible tileCrucible14 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible14.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 15: - world.setBlockState(tempPos, ModBlocks.ironcleanball.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); + world.setBlockState(tempPos, ModBlocks.ironcleanball.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 2); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 16: - world.setBlockState(tempPos, ModBlocks.ironcleanchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); + world.setBlockState(tempPos, ModBlocks.ironcleanchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 2); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 17: @@ -459,43 +459,43 @@ public class ItemStoneTongs extends Item { case 20: return EnumActionResult.FAIL; case 21: - world.setBlockState(tempPos, ModBlocks.hotsteelcrucible.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotsteelcrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible21 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible21.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 22: - world.setBlockState(tempPos, ModBlocks.hotcookedsteelcrucible.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedsteelcrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible22 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible22.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 23: - world.setBlockState(tempPos, ModBlocks.failedsteelcruciblehot.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.failedsteelcruciblehot.getDefaultState(), 2); TileBaseCrucible tileCrucible23 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible23.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 24: - world.setBlockState(tempPos, ModBlocks.steelball.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); + world.setBlockState(tempPos, ModBlocks.steelball.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 2); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 25: - world.setBlockState(tempPos, ModBlocks.steelchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); + world.setBlockState(tempPos, ModBlocks.steelchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 2); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; - case 39: - world.setBlockState(tempPos, ModBlocks.hotbronzecrucible.getDefaultState(), 3); + case 29: + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible39 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible39.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 40: - world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible.getDefaultState(), 2); TileBaseCrucible tileCrucible40 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible40.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); @@ -514,56 +514,56 @@ public class ItemStoneTongs extends Item { 52 | Hot Cooked Bronze Crucible Lapis ***************************/ case 45: - world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_emerald.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_emerald.getDefaultState(), 2); TileBaseCrucible tileCrucible45 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible45.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 46: - world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_emerald.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_emerald.getDefaultState(), 2); TileBaseCrucible tileCrucible46 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible46.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 47: - world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_diamond.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_diamond.getDefaultState(), 2); TileBaseCrucible tileCrucible47 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible47.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 48: - world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_diamond.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_diamond.getDefaultState(), 2); TileBaseCrucible tileCrucible48 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible48.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 49: - world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_redstone.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_redstone.getDefaultState(), 2); TileBaseCrucible tileCrucible49 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible49.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 50: - world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_redstone.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_redstone.getDefaultState(), 2); TileBaseCrucible tileCrucible50 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible50.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 51: - world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_lapis.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_lapis.getDefaultState(), 2); TileBaseCrucible tileCrucible51 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible51.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 52: - world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_lapis.getDefaultState(), 3); + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_lapis.getDefaultState(), 2); TileBaseCrucible tileCrucible52 = (TileBaseCrucible) world.getTileEntity(tempPos); tileCrucible52.countdown = itemstack.getTagCompound().getInteger("cooldown"); itemstack.getTagCompound().setInteger("cooldown", 0); diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 9c046e3a..3b2f971c 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.2.60", + "version": "1.2.61", "mcversion": "1.11.2", "url": "", "updateUrl": "",