aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-05-28 11:59:54 +0200
committerTechnus <daniel112092@gmail.com>2017-05-28 11:59:54 +0200
commit201ff802b7f471c3c1f22ac1392edba0d2a8958a (patch)
treeacc6559129c870e88bb18725f96be46c0cf6d628 /src/main/java/gregtech/common/tileentities/machines
parent5f6a75db62136a7cf6da9bc2d6a84a5ac99b389b (diff)
downloadGT5-Unofficial-201ff802b7f471c3c1f22ac1392edba0d2a8958a.tar.gz
GT5-Unofficial-201ff802b7f471c3c1f22ac1392edba0d2a8958a.tar.bz2
GT5-Unofficial-201ff802b7f471c3c1f22ac1392edba0d2a8958a.zip
If logWood it is ok.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
index 463f94ca60..6583134e6c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
@@ -22,7 +22,6 @@ import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlockBase {
-
private boolean running = false;
private boolean p1, p2, p3, p4, p5, p6;
@@ -195,16 +194,12 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
}
private boolean isWoodLog(Block log, int meta){
- String tTool = log.getHarvestTool(meta);
- //DEBUG TODO Check and remove
- if(!(OrePrefixes.log.contains(new ItemStack(log, 1,meta)) && ((tTool != null) && (tTool.equals("axe"))) && (log.getMaterial() == Material.wood))) {
- GT_Log.out.println("Info> " + log.getUnlocalizedName() + " " + meta + " " + tTool + " " + (log.getMaterial() == Material.wood));
- for (int id : OreDictionary.getOreIDs(new ItemStack(log, 1, meta))) {
- GT_Log.out.println("Ore>" + OreDictionary.getOreName(id));
- }
+ for (int id : OreDictionary.getOreIDs(new ItemStack(log, 1, meta))) {
+ if(OreDictionary.getOreName(id).equals("logWood"))
+ return true;
}
- //DEBUG
- return OrePrefixes.log.contains(new ItemStack(log, 1,meta)) && ((tTool != null) && (tTool.equals("axe"))) && (log.getMaterial() == Material.wood);
+ String tTool = log.getHarvestTool(meta);
+ return OrePrefixes.log.contains(new ItemStack(log, 1,meta)) && ((tTool != null) && (tTool.equals("axe"))) && (log.getMaterial() == Material.wood);
}
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {