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

fixed merge conflicts

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-01-06 19:35:43 -05:00
parent 392914ede3 64429816bd
commit 390248afd3
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kfc/gradle.properties
View File

@@ -6,10 +6,12 @@ org.gradle.jvmargs=-Xmx3G
mod_group=nmd.primal.forgecraft mod_group=nmd.primal.forgecraft
mod_name=ForgeCraft mod_name=ForgeCraft
mod_version=1.4.03 mod_version=1.4.04
forge_version=14.23.0.2517 forge_version=14.23.1.2581
mcp_mappings=snapshot_20171003 mcp_mappings=snapshot_20171003
mc_version=1.12.2 mc_version=1.12.2
primal_version=0.6+ primal_version=0.6+
jei_version=4.8+ jei_version=4.8+
waila_version=1.7.0-B3
apple_version=2.1+

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

@@ -17,9 +17,10 @@ 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.4.03";
public static final String MOD_VERSION = "1.4.04";
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.0,);"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6,);";
/** Mod Structures **/ /** Mod Structures **/
public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy";

2
kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java
View File

@@ -142,7 +142,7 @@ public class Crucible extends Block {
} else if (name.equals("tile.coolwootzcrucible")){ } else if (name.equals("tile.coolwootzcrucible")){
return Item.getItemFromBlock(ModBlocks.wootzball); return Item.getItemFromBlock(ModBlocks.wootzball);
} else if (name.equals("tile.rawcleanironcrucible")){ } else if (name.equals("tile.rawcleanironcrucible")){
return PrimalAPI.Items.GOLDEN_STICK; return PrimalAPI.Items.IRON_DUST;
}else if (name.equals("tile.emptycruciblecracked")){ }else if (name.equals("tile.emptycruciblecracked")){
return Items.CLAY_BALL; return Items.CLAY_BALL;
} }

4
kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java
View File

@@ -46,7 +46,7 @@ import static nmd.primal.core.common.helper.FireHelper.makeSmoke;
public class Forge extends CustomContainerFacing implements ITileEntityProvider{ public class Forge extends CustomContainerFacing implements ITileEntityProvider{
private int maxHeat; private int maxHeat;
//public static final PropertyBool PrimalStates.ACTIVE = PropertyBool.create("PrimalStates.ACTIVE"); //public static final PropertyBool PrimalAPI.States.ACTIVE = PropertyBool.create("PrimalAPI.States.ACTIVE");
protected static final AxisAlignedBB collideBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.99D, 1.0D); protected static final AxisAlignedBB collideBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.99D, 1.0D);
protected static final AxisAlignedBB boundBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); protected static final AxisAlignedBB boundBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
@@ -306,7 +306,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider{
/*@Override /*@Override
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) {
IBlockState state = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer); IBlockState state = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer);
return state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)); return state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalAPI.States.ACTIVE, Boolean.valueOf(false));
}*/ }*/
@Override @Override

3
kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java
View File

@@ -60,9 +60,6 @@ public class Musket extends BaseItem{
stack.getTagCompound().setBoolean("use", false); stack.getTagCompound().setBoolean("use", false);
//} //}
} }
/* /*
public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving) public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving)

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

@@ -41,7 +41,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
} }
this.iteration++; this.iteration++;
if (this.iteration == 100) { if (this.iteration == 100) {
RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); RecipeHelper.fuelManager(world,this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { if(CommonUtils.randomCheck(1000)) {
makeSmoke(world, pos); makeSmoke(world, pos);
} }

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

@@ -2,8 +2,8 @@
"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.4.03", "version": "1.4.04",
"mcversion": "1.12.1", "mcversion": "1.12.2",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",
"authorList": ["KitsuShadow"], "authorList": ["KitsuShadow"],