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

Merge branch 'master-1.12' into feature-1.12

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-09-21 23:42:59 -04:00
parent 456b51827c 6f5dd58fc5
commit fed30aef92
6 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kfc/gradle.properties
View File

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G
mod_group=nmd.primal.forgecraft mod_group=nmd.primal.forgecraft
mod_name=ForgeCraft mod_name=ForgeCraft
mod_version=1.6.05 mod_version=1.6.06
forge_version=14.23.4.2744 forge_version=14.23.4.2744
mcp_mappings=snapshot_20171003 mcp_mappings=snapshot_20171003
mc_version=1.12.2 mc_version=1.12.2

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

@@ -21,7 +21,7 @@ public class ModInfo {
//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.6.05"; public static final String MOD_VERSION = "1.6.06";
public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; 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,);"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);";

7
kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java
View File

@@ -29,11 +29,12 @@ public class AnvilStone extends AnvilBase {
/****************************************************************************** /******************************************************************************
Crafting AnvilStone Recipes Crafting AnvilStone Recipes
*****************************************************************************/ *****************************************************************************/
if (!world.isRemote) {
ItemStack pItem = player.inventory.getCurrentItem(); ItemStack pItem = player.inventory.getCurrentItem();
TileAnvil tile = (TileAnvil) world.getTileEntity(pos); TileAnvil tile = (TileAnvil) world.getTileEntity(pos);
ItemStack stack12 = tile.getSlotStack(12).copy(); ItemStack stack12 = tile.getSlotStack(12).copy();
if (hand.equals(hand.MAIN_HAND)) { if (hand.equals(hand.MAIN_HAND)) {
if (!world.isRemote) {
if (!stack12.isEmpty()) { if (!stack12.isEmpty()) {
if (tile != null) { if (tile != null) {
if ((pItem.getItem() instanceof Gallagher) || (pItem.getItem() == ModItems.forgehammer)) { if ((pItem.getItem() instanceof Gallagher) || (pItem.getItem() == ModItems.forgehammer)) {
@@ -116,11 +117,11 @@ public class AnvilStone extends AnvilBase {
doAnvilRecipe(pItem, tempArray, world, tile, pos, player); doAnvilRecipe(pItem, tempArray, world, tile, pos, player);
return true; return true;
} }
}
doAnvilInventoryManager(pItem, world, tile, pos, hitx, hity, hitz, state, player); doAnvilInventoryManager(pItem, world, tile, pos, hitx, hity, hitz, state, player);
return true; return true;
} }
return false; return false;
} }
return false;
}
} }

6
kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java
View File

@@ -283,7 +283,7 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{
@Override @Override
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitx, float hity, float hitz) public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitx, float hity, float hitz)
{ {
if(!world.isRemote){ //if(!world.isRemote){
//if (hand.equals(player.swingingHand)) { //if (hand.equals(player.swingingHand)) {
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
Block block = world.getBlockState(pos).getBlock(); Block block = world.getBlockState(pos).getBlock();
@@ -430,8 +430,8 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{
} }
} }
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
} //}
return EnumActionResult.FAIL; //return EnumActionResult.FAIL;
} }
public ItemStack getItem(World world, BlockPos pos, IBlockState state, Block block) public ItemStack getItem(World world, BlockPos pos, IBlockState state, Block block)

3
kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java
View File

@@ -233,7 +233,7 @@ public interface AnvilHandler {
static boolean doWork(ItemStack pItem, Integer counter, TileAnvil tile, World world, BlockPos pos, EntityPlayer player) { static boolean doWork(ItemStack pItem, Integer counter, TileAnvil tile, World world, BlockPos pos, EntityPlayer player) {
if (!world.isRemote) {
if (pItem.getItem().equals(ModItems.slottedtongs)) { if (pItem.getItem().equals(ModItems.slottedtongs)) {
SlottedTongs tongs = (SlottedTongs) pItem.getItem(); SlottedTongs tongs = (SlottedTongs) pItem.getItem();
@@ -257,6 +257,7 @@ public interface AnvilHandler {
} }
} }
} }
if (!world.isRemote) {
if (pItem.getItem().equals(Items.AIR) && player.isSneaking()) { if (pItem.getItem().equals(Items.AIR) && player.isSneaking()) {

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.6.05", "version": "1.6.06",
"mcversion": "1.12.2", "mcversion": "1.12.2",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",