diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index 9322b9bb..ae5f5856 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -3,6 +3,7 @@ ## Bugs ## Current Feature +- [ ] Hardness and Resistance calculation for durability damage - [ ] Craft Tweaker Support - [ ] Config to map only wrought iron to vanilla iron or wrought iron to another iron - [ ] Copper Gladius diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractAxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractAxe.java index 3dd55c67..9f7efb26 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractAxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractAxe.java @@ -240,7 +240,7 @@ public abstract class AbstractAxe extends ItemAxe implements ToolNBT { if(material != Material.WOOD && material != Material.PLANTS && material != Material.VINE){ return super.getDestroySpeed(stack, state); } else { - return this.efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1); + return this.efficiency + ( (this.getRedstoneLevel(stack) * 1.5F )); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractPickaxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractPickaxe.java index e44ddfeb..fd0f6d79 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractPickaxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractPickaxe.java @@ -236,7 +236,7 @@ public abstract class AbstractPickaxe extends ItemPickaxe implements ToolNBT { if(material != Material.IRON && material != Material.ANVIL && material != Material.ROCK){ return super.getDestroySpeed(stack, state); } else { - return this.efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1); + return this.efficiency + ( (this.getRedstoneLevel(stack) * 1.5F )); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractShovel.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractShovel.java index 986a03e3..80a83658 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractShovel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractShovel.java @@ -213,7 +213,7 @@ public class AbstractShovel extends ItemSpade implements ToolNBT { if (state.getBlock().isToolEffective(type, state)) return (efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1)); } - return this.EFFECTIVE_ON.contains(state.getBlock()) ? (this.efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1)) : 1.0F; + return this.EFFECTIVE_ON.contains(state.getBlock()) ? (this.efficiency + ( (this.getRedstoneLevel(stack) * 1.25F ))) : 1.0F; } @SideOnly(Side.CLIENT) 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 b47fcf51..56fe96ff 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -19,6 +19,8 @@ import nmd.primal.forgecraft.blocks.machine.BloomeryBase; import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.init.ModItems; +import javax.annotation.Nullable; + /** * Created by mminaie on 1/22/17. */ @@ -76,7 +78,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { //System.out.println(tag); ItemStackHelper.loadAllItems(tag, ingList); ItemStackHelper.loadAllItems(tag, dropList); - CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4)); + @Nullable CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4)); if (recipe != null) { if(!recipe.isDisabled()) { if (this.getHeat() >= recipe.getCookTemp() &&