diff --git a/kfc/gradle.properties b/kfc/gradle.properties index b205ed37..0fe98422 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -6,10 +6,12 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.4.03 -forge_version=14.23.0.2517 +mod_version=1.4.04 +forge_version=14.23.1.2581 mcp_mappings=snapshot_20171003 mc_version=1.12.2 primal_version=0.6+ jei_version=4.8+ +waila_version=1.7.0-B3 +apple_version=2.1+ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index 29bd07f4..b166610a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,9 +17,10 @@ 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.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 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 **/ public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java index 5b0f5174..e154ef0f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java @@ -142,7 +142,7 @@ public class Crucible extends Block { } else if (name.equals("tile.coolwootzcrucible")){ return Item.getItemFromBlock(ModBlocks.wootzball); } else if (name.equals("tile.rawcleanironcrucible")){ - return PrimalAPI.Items.GOLDEN_STICK; + return PrimalAPI.Items.IRON_DUST; }else if (name.equals("tile.emptycruciblecracked")){ return Items.CLAY_BALL; } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index d91ed880..5cc897cb 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -46,7 +46,7 @@ import static nmd.primal.core.common.helper.FireHelper.makeSmoke; public class Forge extends CustomContainerFacing implements ITileEntityProvider{ 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 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 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); - 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 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java index 5dd6a40d..489395ef 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java @@ -60,9 +60,6 @@ public class Musket extends BaseItem{ stack.getTagCompound().setBoolean("use", false); //} - - - } /* public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 67c3cb18..6e901a7a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -41,7 +41,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { } this.iteration++; if (this.iteration == 100) { - RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); + RecipeHelper.fuelManager(world,this, this.getSlotStack(0)); if(CommonUtils.randomCheck(1000)) { makeSmoke(world, pos); } diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 6f867f4d..deae2b47 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,8 +2,8 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.4.03", - "mcversion": "1.12.1", + "version": "1.4.04", + "mcversion": "1.12.2", "url": "", "updateUrl": "", "authorList": ["KitsuShadow"],