diff --git a/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java b/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java index 4d2feba9f..fc7c8b764 100644 --- a/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java +++ b/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java @@ -111,18 +111,26 @@ public class CharcoalPileController extends RectangularMultiblockControllerBase if (!isActive()) { return false; } - if(woodBurnTime == 0){ - int comps = 0; + if(woodBurnTime == 0 && tickCount % 20 == 0){ + int validComps = 0; int newBurnTime = 0; for (IMultiblockComponent part : connectedParts) { ICharcoalPileComponent comp = (ICharcoalPileComponent) part; if (comp.getTreeSpecies() != null) { - comps++; + validComps++; IWoodProvider woodProvider = comp.getTreeSpecies().getWoodProvider(); - newBurnTime += woodProvider.getCombustibility() * 1000; + int charcoalAmount = woodProvider.getCarbonization(); + while(worldObj.rand.nextFloat() < woodProvider.getCharcoalChance(charcoalAmount)){ + charcoalAmount++; + } + newBurnTime += charcoalAmount * 500; } } - woodBurnTime = newBurnTime / comps; + if(validComps <= 0){ + woodBurnTime = newBurnTime / validComps; + }else{ + woodBurnTime = 0; + } } if (burnTime >= woodBurnTime) { for(IMultiblockComponent part : connectedParts) { diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java index 4affa4d25..8a7508312 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -12,7 +12,6 @@ package forestry.farming; import java.util.Arrays; import java.util.List; - import net.minecraft.block.BlockBeetroot; import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockNetherWart; @@ -30,7 +29,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; @@ -246,7 +244,7 @@ public class PluginFarming extends BlankForestryPlugin { ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.APATITE, 1), Circuit.farmShroomManual); ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1), Circuit.farmCocoaManual); } - + @Override public void getHiddenItems(List hiddenItems) { // mushrooms are a workaround for the farm and should not be obtainable