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-10-25 22:18:12 -04:00
parent 4260b1169c 69f25c4d0c
commit 7afe86e45e
4 changed files with 4 additions and 7 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_name=ForgeCraft
mod_version=1.6.31
mod_version=1.6.32
forge_version=14.23.4.2765
mcp_mappings=snapshot_20171003
mc_version=1.12.2

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

@@ -22,7 +22,7 @@ public class ModInfo {
//public static final String MOD_PREFIX = MOD_ID + ":";
public static final String MOD_CHANNEL = MOD_ID;
public static final String MOD_VERSION = "1.6.31";
public static final String MOD_VERSION = "1.6.32";
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,);";

5
kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java
View File

@@ -65,9 +65,6 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider {
if(hand.equals(MAIN_HAND)) {
System.out.println(player.inventory.getCurrentItem());
System.out.println(hand);
ItemStack pItem = player.inventory.getCurrentItem().copy();
pItem.setCount(1);
@@ -87,7 +84,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider {
}
/**SET INGREDIENT ARRAY FOR THE CRUCIBLE NOW**/
if( player.inventory.getSlotFor(player.inventory.getCurrentItem()) != -1 ) {
if(hand.equals(MAIN_HAND)) {
ItemStack pItem = player.inventory.getCurrentItem().copy();
pItem.setCount(1);
if (!player.isSneaking()) {

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

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