Add and fix

More Bugfixes, Soldering Iron and Magic Energy Absorber

7 files changed, 30 insertions, 13 deletions

diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java
index 3f28baf670..90ece775cb 100644
--- a/main/java/gregtech/api/enums/ItemList.java
+++ b/main/java/gregtech/api/enums/ItemList.java
@@ -633,6 +633,10 @@ public enum ItemList implements IItemContainer {
 	MagicEnergyConverter_LV, 
 	MagicEnergyConverter_MV, 
 	MagicEnergyConverter_HV,
+	MagicEnergyAbsorber_LV,
+	MagicEnergyAbsorber_MV,
+	MagicEnergyAbsorber_HV,
+	MagicEnergyAbsorber_EV,
 	Depleted_Thorium_1,
 	Depleted_Thorium_2,
 	Depleted_Thorium_4,
@@ -640,7 +644,6 @@ public enum ItemList implements IItemContainer {
 	Distillation_Tower,
 	Energy_LapotronicOrb2, 
 	ZPM2,
-	
 	NULL;
 	
 	public static final ItemList[]
diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java
index 2b2e4e20fb..3fda89be40 100644
--- a/main/java/gregtech/api/enums/Materials.java
+++ b/main/java/gregtech/api/enums/Materials.java
@@ -198,6 +198,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	Fairy				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Fairy"							,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	Ludicrite			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Ludicrite"						,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	Pokefennium			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Pokefennium"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
+	Draconium			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Draconium"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
+	DraconiumAwakened	(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Awakened Draconium"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	
 	/**
 	 * Unknown Material Components. Dead End Section.
diff --git a/main/java/gregtech/api/enums/TextureSet.java b/main/java/gregtech/api/enums/TextureSet.java
index 3b658a8c93..bae20e91f5 100644
--- a/main/java/gregtech/api/enums/TextureSet.java
+++ b/main/java/gregtech/api/enums/TextureSet.java
@@ -101,7 +101,7 @@ public class TextureSet {
 		mTextures[ 46] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadArrow");
 		mTextures[ 47] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadScrewdriver");
 		mTextures[ 48] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadBuzzSaw");
-		mTextures[ 49] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void");
+		mTextures[ 49] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadSoldering");
 		mTextures[ 50] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void");
 		mTextures[ 51] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/wireFine");
 		mTextures[ 52] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/gearGtSmall");
diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java
index 068ee12f66..a0bbce7049 100644
--- a/main/java/gregtech/api/enums/Textures.java
+++ b/main/java/gregtech/api/enums/Textures.java
@@ -41,7 +41,7 @@ public class Textures {
 		, MACHINE_UV_TOP, MACHINE_UV_SIDE, MACHINE_UV_BOTTOM
 		, MACHINE_MAX_TOP, MACHINE_MAX_SIDE, MACHINE_MAX_BOTTOM
 		, MACHINE_BRONZEPLATEDBRICKS, MACHINE_HEATPROOFCASING, MACHINE_BRONZEBLASTFURNACE, MACHINE_BRONZEBLASTFURNACE_ACTIVE
-		, MACHINE_CASING_ROBUST_TUNGSTENSTEEL, MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, MACHINE_CASING_FUSION_2,MACHINE_CASING_MAGIC,MACHINE_CASING_MAGIC_FRONT,MACHINE_CASING_DRAGONEGG
+		, MACHINE_CASING_ROBUST_TUNGSTENSTEEL, MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, MACHINE_CASING_FUSION_2,MACHINE_CASING_MAGIC,MACHINE_CASING_MAGIC_ACTIVE,MACHINE_CASING_MAGIC_FRONT,MACHINE_CASING_MAGIC_FRONT_ACTIVE,MACHINE_CASING_DRAGONEGG
 		, MACHINE_CASING_SOLID_STEEL, MACHINE_CASING_FROST_PROOF, MACHINE_CASING_PUMP, MACHINE_CASING_MOTOR, MACHINE_CASING_PIPE_BRONZE, MACHINE_CASING_PIPE_STEEL, MACHINE_CASING_PIPE_TITANIUM, MACHINE_CASING_PIPE_TUNGSTENSTEEL, MACHINE_CASING_GEARBOX_BRONZE, MACHINE_CASING_GEARBOX_STEEL, MACHINE_CASING_GEARBOX_TITANIUM, MACHINE_CASING_GEARBOX_TUNGSTENSTEEL, MACHINE_CASING_DATA_DRIVE, MACHINE_CASING_CONTAINMENT_FIELD, MACHINE_CASING_ASSEMBLER, MACHINE_CASING_PROCESSOR
 		, MACHINE_CASING_STRIPES_A, MACHINE_CASING_STRIPES_B, MACHINE_CASING_RADIOACTIVEHAZARD, MACHINE_CASING_BIOHAZARD, MACHINE_CASING_EXPLOSIONHAZARD, MACHINE_CASING_FIREHAZARD, MACHINE_CASING_ACIDHAZARD, MACHINE_CASING_MAGICHAZARD, MACHINE_CASING_FROSTHAZARD, MACHINE_CASING_NOISEHAZARD, MACHINE_CASING_GRATE, MACHINE_CASING_VENT, MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, MACHINE_CASING_FIREBOX_STEEL, MACHINE_CASING_FIREBOX_TUNGSTENSTEEL
 		, BOILER_SOLAR, BOILER_FRONT, BOILER_FRONT_ACTIVE, BOILER_LAVA_FRONT, BOILER_LAVA_FRONT_ACTIVE
@@ -320,7 +320,7 @@ public class Textures {
 		, KNIFE, BUTCHERYKNIFE, SICKLE
 		, SCOOP, GRAFTER
 		, PLUNGER, ROLLING_PIN
-		, HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER
+		, HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING
 		, POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV
 		, DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8
 		, ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8
diff --git a/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
index f2416ecc4b..181e5bddf6 100644
--- a/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
@@ -58,6 +58,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
 				} else {
 					GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
 				}
+				if((tPrefix==OrePrefixes.stick||tPrefix==OrePrefixes.wireFine)&&(tMaterial==Materials.Lead||tMaterial==Materials.Tin||tMaterial==Materials.SolderingAlloy)){GregTech_API.sSolderingMetalList.add(tStack);}
 			}
 		}
 	}
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 058a396593..95d8cc19b2 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -1,6 +1,8 @@
 package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -25,6 +27,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 	public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0;
 	public ItemStack[] mOutputItems = null;
 	public FluidStack[] mOutputFluids = null;
+	public static boolean disableMaintenance;
 	
 	public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Input>();
 	public ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Output>();
@@ -37,10 +40,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 	
 	public GT_MetaTileEntity_MultiBlockBase(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional, 2);
+		this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
 	}
 	
 	public GT_MetaTileEntity_MultiBlockBase(String aName) {
 		super(aName, 2);
+		this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
 	}
 	
 	@Override
@@ -145,12 +150,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 				if (mMachine) {
 					for (GT_MetaTileEntity_Hatch_Maintenance tHatch : mMaintenanceHatches) {
 						if (isValidMetaTileEntity(tHatch)) {
+							if(!this.disableMaintenance){
 							if (tHatch.mWrench) mWrench = true;
 							if (tHatch.mScrewdriver) mScrewdriver = true;
 							if (tHatch.mSoftHammer) mSoftHammer = true;
 							if (tHatch.mHardHammer) mHardHammer = true;
 							if (tHatch.mSolderingTool) mSolderingTool = true;
-							if (tHatch.mCrowbar) mCrowbar = true;
+							if (tHatch.mCrowbar) mCrowbar = true;}else{
+									mWrench = true;
+									mScrewdriver = true;
+									mSoftHammer = true;
+									mHardHammer = true;
+									mSolderingTool = true;
+									mCrowbar = true;
+							}
 							
 							tHatch.mWrench = false;
 							tHatch.mScrewdriver = false;
diff --git a/main/java/gregtech/api/util/GT_ModHandler.java b/main/java/gregtech/api/util/GT_ModHandler.java
index 94ac214a61..6f44731c62 100644
--- a/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/main/java/gregtech/api/util/GT_ModHandler.java
@@ -37,6 +37,7 @@ import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -1457,7 +1458,7 @@ public class GT_ModHandler {
 	 * Uses an Item. Tries to discharge in case of Electric Items
 	 */
 	public static boolean damageOrDechargeItem(ItemStack aStack, int aDamage, int aDecharge, EntityLivingBase aPlayer) {
-		if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return F;
+		if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return F;	
 		if (aPlayer != null && aPlayer instanceof EntityPlayer && ((EntityPlayer)aPlayer).capabilities.isCreativeMode) return T;
 		if (aStack.getItem() instanceof IDamagableItem) {
 			return ((IDamagableItem)aStack.getItem()).doDamageToItem(aStack, aDamage);
@@ -1500,13 +1501,10 @@ public class GT_ModHandler {
 				if (tPlayer.capabilities.isCreativeMode) return T;
 				for (int i = 0; i < tPlayer.inventory.mainInventory.length; i++) {
 					if (GT_Utility.isStackInList(tPlayer.inventory.mainInventory[i], GregTech_API.sSolderingMetalList)) {
-						if (damageOrDechargeItem(aStack, 1, 1000, tPlayer)) {
-							if (tPlayer.inventory.mainInventory[i].getItemDamage() >= tPlayer.inventory.mainInventory[i].getMaxDamage()) tPlayer.inventory.mainInventory[i] = null;
-						    if (damageOrDechargeItem(tPlayer.inventory.mainInventory[i], 1, 1000, tPlayer)) {
-								if (tPlayer.inventory.mainInventory[i].getItemDamage() >= tPlayer.inventory.mainInventory[i].getMaxDamage()) tPlayer.inventory.mainInventory[i] = null;
-							    if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges();
-								return T;
-							}
+						tPlayer.inventory.mainInventory[i].stackSize--;
+						if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges();
+						if (canUseElectricItem(aStack, 10000)) {
+							return GT_ModHandler.useElectricItem(aStack, 10000, (EntityPlayer)aPlayer);
 						}
 					}
 				}