diff options
4 files changed, 8 insertions, 9 deletions
diff --git a/.classpath b/.classpath index e96d64f755..45089c80f5 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="conduits/|miscutil/enderio/conduit/GregTech/|miscutil/gregtech/enums/Materials2.java|miscutil/gregtech/objects/GregMaterialStack.java|miscutil/core/util/Log.java|miscutil/enderio/|miscutil/core/item/tool/bloodsteel/|miscutil/core/block/reactor/|miscutil/gregtech/common/tools/GT_Tool_Turbine_Large.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Normal.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Small.java" kind="src" path="src/Java"/> + <classpathentry excluding="conduits/|miscutil/enderio/conduit/GregTech/|miscutil/gregtech/enums/Materials2.java|miscutil/gregtech/objects/GregMaterialStack.java|miscutil/core/util/Log.java|miscutil/enderio/|miscutil/core/item/tool/bloodsteel/|miscutil/core/block/reactor/|miscutil/gregtech/common/tools/GT_Tool_Turbine_Large.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Normal.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Small.java|miscutil/gregtech/api/enums/GregtechTextures.java|miscutil/gregtech/api/enums/GregtechTextureSet.java" kind="src" path="src/Java"/> <classpathentry kind="src" path="src/resources"/> <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> @@ -9,9 +9,9 @@ <classpathentry kind="lib" path="libs/Waila-1.5.10_1.7.10-deobf.jar"/> <classpathentry kind="lib" path="libs/EnderIO-1.7.10-2.2.8.381-dev.jar" sourcepath="libsrc/EnderIO-1.7.10-2.2.8.381-sources.jar"/> <classpathentry kind="lib" path="libs/Railcraft_1.7.10-9.9.0.0-dev.jar"/> - <classpathentry kind="lib" path="libs/gregtech-5.8.61-dev.jar"/> <classpathentry kind="lib" path="libs/growthcraft-1.7.10-2.3.1-complete.jar"/> <classpathentry kind="lib" path="libs/Psychedelicraft-1.5.2.jar"/> <classpathentry kind="lib" path="libs/IvToolkit-1.2.jar"/> + <classpathentry kind="lib" path="libs/gregtech-5.8.59-dev.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java b/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java index 9d0f1f2729..b299819a81 100644 --- a/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java +++ b/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java @@ -5,7 +5,7 @@ public class Psychedelicraft_Booze { public static void run(){ //Psychedelicraft; - ivtoolkit + //ivtoolkit } } diff --git a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java index 2f5d8951b7..7bd5d3115c 100644 --- a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java +++ b/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.Arrays; import miscutil.core.block.ModBlocks; -import miscutil.core.util.Utils; import miscutil.gregtech.api.gui.GUI_MultiMachine; import miscutil.gregtech.api.util.GregtechRecipe; import net.minecraft.entity.player.InventoryPlayer; @@ -215,17 +214,17 @@ public class GregtechMetaTileEntityIndustrialCokeOven xr = aBaseMetaTileEntity.getXCoord(); yr = aBaseMetaTileEntity.getYCoord(); zr = aBaseMetaTileEntity.getZCoord(); - Utils.LOG_WARNING("STEP 1 - x ["+xr+"] y ["+yr+"] z ["+zr+"]"); + //Utils.LOG_WARNING("STEP 1 - x ["+xr+"] y ["+yr+"] z ["+zr+"]"); for (int j = -1; j < 2; j++) { xr = aBaseMetaTileEntity.getXCoord(); yr = aBaseMetaTileEntity.getYCoord(); zr = aBaseMetaTileEntity.getZCoord(); - Utils.LOG_WARNING("STEP 2 - x ["+xr+"] y ["+yr+"] z ["+zr+"]"); + //Utils.LOG_WARNING("STEP 2 - x ["+xr+"] y ["+yr+"] z ["+zr+"]"); if ((xDir + i != 0) || (zDir + j != 0)) { xr = aBaseMetaTileEntity.getXCoord(); yr = aBaseMetaTileEntity.getYCoord(); zr = aBaseMetaTileEntity.getZCoord(); - Utils.LOG_WARNING("STEP 3 - x ["+xr+"] y ["+yr+"] z ["+zr+"]"); + //Utils.LOG_WARNING("STEP 3 - x ["+xr+"] y ["+yr+"] z ["+zr+"]"); IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j); if ((!addMaintenanceToMachineList(tTileEntity, 1)) && (!addInputToMachineList(tTileEntity, 1)) && (!addOutputToMachineList(tTileEntity, 1)) && (!addEnergyInputToMachineList(tTileEntity, 1))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != ModBlocks.blockCasingsMisc) { diff --git a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java index 15cf1599b6..bf3921f9b6 100644 --- a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java +++ b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java @@ -1,7 +1,7 @@ package miscutil.gregtech.common.tools; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; -import miscutil.gregtech.api.enums.GregtechTextures; public class TOOL_Gregtech_MaxEfficiencyMultiBlockItem extends TOOL_Gregtech_BaseMultiblockItem { @Override @@ -21,7 +21,7 @@ public class TOOL_Gregtech_MaxEfficiencyMultiBlockItem extends TOOL_Gregtech_Bas @Override public IIconContainer getTurbineIcon() { - return GregtechTextures.ItemIcons.TURBINE_HUGE; + return Textures.ItemIcons.TURBINE_HUGE; } } |