nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing stonetongs bug unable to replicate switching all state flags to 2

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2017-07-03 20:26:37 -04:00
parent 3040b4cc52
commit 226eb7a62f
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kfc/gradle.properties
View File

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G
mod_group=nmd.primal.forgecraft mod_group=nmd.primal.forgecraft
mod_name=ForgeCraft mod_name=ForgeCraft
mod_version=1.2.60 mod_version=1.2.61
forge_version=13.20.0.2315 forge_version=13.20.0.2315
mcp_mappings=snapshot_20170121 mcp_mappings=snapshot_20170121
mc_version=1.11.2 mc_version=1.11.2

2
kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java
View File

@@ -17,7 +17,7 @@ public class ModInfo {
public static final String MOD_CONFIG = "primal/" + MOD_ID; public static final String MOD_CONFIG = "primal/" + MOD_ID;
//public static final String MOD_PREFIX = MOD_ID + ":"; //public static final String MOD_PREFIX = MOD_ID + ":";
public static final String MOD_CHANNEL = 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 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,);"; public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2315,);" + "required-after:primal@[0.4,);";

54
kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java
View File

@@ -371,46 +371,46 @@ public class ItemStoneTongs extends Item {
case 0: case 0:
break; break;
case 1: case 1:
world.setBlockState(tempPos, ModBlocks.emptycruciblehot.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.emptycruciblehot.getDefaultState(), 2);
TileBaseCrucible tileCrucible1 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible1 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible1.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible1.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 2: case 2:
world.setBlockState(tempPos, ModBlocks.emptycruciblecrackedhot.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.emptycruciblecrackedhot.getDefaultState(), 2);
TileBaseCrucible tileCrucible2 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible2 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible2.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible2.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 3: case 3:
world.setBlockState(tempPos, ModBlocks.hotironcrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotironcrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible3 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible3 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible3.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible3.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 4: case 4:
world.setBlockState(tempPos, ModBlocks.hotcookedironcrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedironcrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible4 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible4 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible4.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible4.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 5: case 5:
world.setBlockState(tempPos, ModBlocks.failedironcruciblehot.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.failedironcruciblehot.getDefaultState(), 2);
TileBaseCrucible tileCrucible5 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible5 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible5.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible5.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 6: 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); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 7: 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); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 8: case 8:
@@ -422,7 +422,7 @@ public class ItemStoneTongs extends Item {
case 11: case 11:
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
case 12: case 12:
world.setBlockState(tempPos, ModBlocks.hotcleanironcrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcleanironcrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible12 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible12 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible12.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible12.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
@@ -436,18 +436,18 @@ public class ItemStoneTongs extends Item {
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 14: case 14:
world.setBlockState(tempPos, ModBlocks.failedcleanironcruciblehot.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.failedcleanironcruciblehot.getDefaultState(), 2);
TileBaseCrucible tileCrucible14 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible14 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible14.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible14.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 15: 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); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 16: 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); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 17: case 17:
@@ -459,43 +459,43 @@ public class ItemStoneTongs extends Item {
case 20: case 20:
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
case 21: case 21:
world.setBlockState(tempPos, ModBlocks.hotsteelcrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotsteelcrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible21 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible21 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible21.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible21.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 22: case 22:
world.setBlockState(tempPos, ModBlocks.hotcookedsteelcrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedsteelcrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible22 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible22 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible22.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible22.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 23: case 23:
world.setBlockState(tempPos, ModBlocks.failedsteelcruciblehot.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.failedsteelcruciblehot.getDefaultState(), 2);
TileBaseCrucible tileCrucible23 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible23 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible23.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible23.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 24: 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); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 25: 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); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 39: case 29:
world.setBlockState(tempPos, ModBlocks.hotbronzecrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotbronzecrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible39 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible39 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible39.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible39.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 40: case 40:
world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible.getDefaultState(), 2);
TileBaseCrucible tileCrucible40 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible40 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible40.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible40.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
@@ -514,56 +514,56 @@ public class ItemStoneTongs extends Item {
52 | Hot Cooked Bronze Crucible Lapis 52 | Hot Cooked Bronze Crucible Lapis
***************************/ ***************************/
case 45: case 45:
world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_emerald.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_emerald.getDefaultState(), 2);
TileBaseCrucible tileCrucible45 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible45 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible45.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible45.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 46: case 46:
world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_emerald.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_emerald.getDefaultState(), 2);
TileBaseCrucible tileCrucible46 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible46 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible46.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible46.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 47: case 47:
world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_diamond.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_diamond.getDefaultState(), 2);
TileBaseCrucible tileCrucible47 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible47 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible47.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible47.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 48: case 48:
world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_diamond.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_diamond.getDefaultState(), 2);
TileBaseCrucible tileCrucible48 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible48 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible48.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible48.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 49: case 49:
world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_redstone.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_redstone.getDefaultState(), 2);
TileBaseCrucible tileCrucible49 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible49 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible49.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible49.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 50: case 50:
world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_redstone.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_redstone.getDefaultState(), 2);
TileBaseCrucible tileCrucible50 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible50 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible50.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible50.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 51: case 51:
world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_lapis.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_lapis.getDefaultState(), 2);
TileBaseCrucible tileCrucible51 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible51 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible51.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible51.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);
itemstack.getTagCompound().setInteger("type", 0); itemstack.getTagCompound().setInteger("type", 0);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
case 52: case 52:
world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_lapis.getDefaultState(), 3); world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_lapis.getDefaultState(), 2);
TileBaseCrucible tileCrucible52 = (TileBaseCrucible) world.getTileEntity(tempPos); TileBaseCrucible tileCrucible52 = (TileBaseCrucible) world.getTileEntity(tempPos);
tileCrucible52.countdown = itemstack.getTagCompound().getInteger("cooldown"); tileCrucible52.countdown = itemstack.getTagCompound().getInteger("cooldown");
itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("cooldown", 0);

2
kfc/src/main/resources/mcmod.info
View File

@@ -2,7 +2,7 @@
"modid": "forgecraft", "modid": "forgecraft",
"name": "Kitsu's Forgecraft", "name": "Kitsu's Forgecraft",
"description": "Forged with sweat and blood", "description": "Forged with sweat and blood",
"version": "1.2.60", "version": "1.2.61",
"mcversion": "1.11.2", "mcversion": "1.11.2",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",