update with new code

This commit is contained in:
Mohammad-Ali Minaie
2018-10-02 17:31:53 -04:00
parent 0b1fac7b05
commit bf125d564f
5 changed files with 7 additions and 4 deletions

View File

@@ -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

View File

@@ -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 ));
}
}

View File

@@ -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 ));
}
}

View File

@@ -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)

View File

@@ -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() &&