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

update with new code

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
kfc/To-Dos.md
View File

@@ -3,6 +3,7 @@
## Bugs ## Bugs
## Current Feature ## Current Feature
- [ ] Hardness and Resistance calculation for durability damage
- [ ] Craft Tweaker Support - [ ] Craft Tweaker Support
- [ ] Config to map only wrought iron to vanilla iron or wrought iron to another iron - [ ] Config to map only wrought iron to vanilla iron or wrought iron to another iron
- [ ] Copper Gladius - [ ] Copper Gladius

2
kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractAxe.java
View File

@@ -240,7 +240,7 @@ public abstract class AbstractAxe extends ItemAxe implements ToolNBT {
if(material != Material.WOOD && material != Material.PLANTS && material != Material.VINE){ if(material != Material.WOOD && material != Material.PLANTS && material != Material.VINE){
return super.getDestroySpeed(stack, state); return super.getDestroySpeed(stack, state);
} else { } else {
return this.efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1); return this.efficiency + ( (this.getRedstoneLevel(stack) * 1.5F ));
} }
} }

2
kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractPickaxe.java
View File

@@ -236,7 +236,7 @@ public abstract class AbstractPickaxe extends ItemPickaxe implements ToolNBT {
if(material != Material.IRON && material != Material.ANVIL && material != Material.ROCK){ if(material != Material.IRON && material != Material.ANVIL && material != Material.ROCK){
return super.getDestroySpeed(stack, state); return super.getDestroySpeed(stack, state);
} else { } else {
return this.efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1); return this.efficiency + ( (this.getRedstoneLevel(stack) * 1.5F ));
} }
} }

2
kfc/src/main/java/nmd/primal/forgecraft/items/tools/AbstractShovel.java
View File

@@ -213,7 +213,7 @@ public class AbstractShovel extends ItemSpade implements ToolNBT {
if (state.getBlock().isToolEffective(type, state)) if (state.getBlock().isToolEffective(type, state))
return (efficiency * ( (this.getRedstoneLevel(stack) * 2 ) + 1)); 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) @SideOnly(Side.CLIENT)

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

@@ -19,6 +19,8 @@ import nmd.primal.forgecraft.blocks.machine.BloomeryBase;
import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.crafting.CrucibleCrafting;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
import javax.annotation.Nullable;
/** /**
* Created by mminaie on 1/22/17. * Created by mminaie on 1/22/17.
*/ */
@@ -76,7 +78,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
//System.out.println(tag); //System.out.println(tag);
ItemStackHelper.loadAllItems(tag, ingList); ItemStackHelper.loadAllItems(tag, ingList);
ItemStackHelper.loadAllItems(tag, dropList); 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 != null) {
if(!recipe.isDisabled()) { if(!recipe.isDisabled()) {
if (this.getHeat() >= recipe.getCookTemp() && if (this.getHeat() >= recipe.getCookTemp() &&