+ Added recipes for Wireless Chargers.

$ Fixed exploit using Long-Range mode, temporarily disabled.

3 files changed, 80 insertions, 32 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 124e109f25..a8a4e5ad13 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1053,6 +1053,53 @@ public class RECIPES_Machines {
 						"plateStainlessSteel",CI.emitter_ULV,"plateStainlessSteel",
 						ItemUtils.getSimpleStack(ModBlocks.blockProjectTable));
 			}
+			
+			//Wireless Chargers
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_LV, CI.circuitTier1, CI.emitter_LV,
+					CI.component_Plate[3], CI.machineHull_LV, CI.component_Plate[3],
+					CI.sensor_LV, CI.fieldGenerator_LV, CI.sensor_LV, 
+					GregtechItemList.Charger_LV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_MV, CI.circuitTier2, CI.emitter_MV,
+					CI.component_Plate[4], CI.machineHull_MV, CI.component_Plate[4],
+					CI.sensor_MV, CI.fieldGenerator_MV, CI.sensor_MV, 
+					GregtechItemList.Charger_MV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_HV, CI.circuitTier3, CI.emitter_HV,
+					CI.component_Plate[5], CI.machineHull_HV, CI.component_Plate[5],
+					CI.sensor_HV, CI.fieldGenerator_HV, CI.sensor_HV, 
+					GregtechItemList.Charger_HV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_EV, CI.circuitTier4, CI.emitter_EV,
+					CI.component_Plate[6], CI.machineHull_EV, CI.component_Plate[6],
+					CI.sensor_EV, CI.fieldGenerator_EV, CI.sensor_EV, 
+					GregtechItemList.Charger_EV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_IV, CI.circuitTier5, CI.emitter_IV,
+					CI.component_Plate[7], CI.machineHull_IV, CI.component_Plate[7],
+					CI.sensor_IV, CI.fieldGenerator_IV, CI.sensor_IV, 
+					GregtechItemList.Charger_IV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_LuV, CI.circuitTier6, CI.emitter_LuV,
+					CI.component_Plate[8], CI.machineHull_LuV, CI.component_Plate[8],
+					CI.sensor_LuV, CI.fieldGenerator_LuV, CI.sensor_LuV, 
+					GregtechItemList.Charger_LuV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_ZPM, CI.circuitTier7, CI.emitter_ZPM,
+					CI.component_Plate[9], CI.machineHull_ZPM, CI.component_Plate[9],
+					CI.sensor_ZPM, CI.fieldGenerator_ZPM, CI.sensor_ZPM, 
+					GregtechItemList.Charger_ZPM.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_UV, CI.circuitTier8, CI.emitter_UV,
+					CI.component_Plate[10], CI.machineHull_UV, CI.component_Plate[10],
+					CI.sensor_UV, CI.fieldGenerator_UV, CI.sensor_UV, 
+					GregtechItemList.Charger_UV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_MAX, CI.circuitTier9, CI.emitter_MAX,
+					CI.component_Plate[11], CI.machineHull_MAX, CI.component_Plate[11],
+					CI.sensor_MAX, CI.fieldGenerator_MAX, CI.sensor_MAX, 
+					GregtechItemList.Charger_MAX.get(1));
 
 
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index 4a59a621f7..6ff0536c85 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -42,10 +42,10 @@ public class ChargingHelper {
 
 
 					if (mPlayerMan != null){
-						//Utils.LOG_INFO("Found Player.");
+						//Utils.LOG_WARNING("Found Player.");
 
 						if (Utils.isServer()){
-							//Utils.LOG_INFO("Found Server-Side.");
+							//Utils.LOG_WARNING("Found Server-Side.");
 
 							mTickTimer++;				
 							if (mTickTimer % mTickMultiplier == 0){					
@@ -73,10 +73,10 @@ public class ChargingHelper {
 												long mEuUsed = 0;
 												if (mEntityTemp.getMode() == 0){
 
-													if (!LR.isEmpty() && LR.containsKey(mPlayerMan)){
+													/*if (!LR.isEmpty() && LR.containsKey(mPlayerMan)){
 														mCurrentEu = chargeItems(mEntityTemp, mArmourContents, mPlayerMan);
 														mCurrentEu = chargeItems(mEntityTemp, mInventoryContents, mPlayerMan);
-													}
+													}*/
 												}
 												else if (mEntityTemp.getMode() == 1){
 													if (!LO.isEmpty() && LO.containsValue(mPlayerMan)){
@@ -85,10 +85,10 @@ public class ChargingHelper {
 													}
 												}
 												else {
-													if (!LR.isEmpty() && LR.containsKey(mPlayerMan)){
+													/*if (!LR.isEmpty() && LR.containsKey(mPlayerMan)){
 														mCurrentEu = chargeItems(mEntityTemp, mArmourContents, mPlayerMan);
 														mCurrentEu = chargeItems(mEntityTemp, mInventoryContents, mPlayerMan);
-													}
+													}*/
 													if (!LO.isEmpty() && LO.containsValue(mPlayerMan)){
 														mCurrentEu = chargeItems(mEntityTemp, mArmourContents, mPlayerMan);
 														mCurrentEu = chargeItems(mEntityTemp, mInventoryContents, mPlayerMan);
@@ -130,7 +130,7 @@ public class ChargingHelper {
 		}
 		
 		catch (Throwable t){
-			//Utils.LOG_INFO("State of Wireless Charger changed in an invalid way, this prevented a crash.");
+			//Utils.LOG_WARNING("State of Wireless Charger changed in an invalid way, this prevented a crash.");
 
 			if (!mChargerMap.isEmpty()){				
 				for (GregtechMetaWirelessCharger r : mChargerMap.values()){
@@ -183,20 +183,20 @@ public class ChargingHelper {
 		if (mEntity == null){
 			return false;
 		}
-		Utils.LOG_INFO("trying to map new player");
+		Utils.LOG_WARNING("trying to map new player");
 		if (mValidPlayers.containsKey(mPlayer)){
-			Utils.LOG_INFO("Key contains player already?");
+			Utils.LOG_WARNING("Key contains player already?");
 			return false;
 		}
 		else {
-			Utils.LOG_INFO("key not found, adding");
+			Utils.LOG_WARNING("key not found, adding");
 			Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode());
 			if (mValidPlayers.put(mPlayer, mEntry) == null){
-				Utils.LOG_INFO("Added a Player to the Tick Map.");
+				Utils.LOG_WARNING("Added a Player to the Tick Map.");
 				return true;
 			}
 			else {
-				Utils.LOG_INFO("Tried to add player but it was already there?");
+				Utils.LOG_WARNING("Tried to add player but it was already there?");
 				return false;
 			}
 		}
@@ -206,21 +206,21 @@ public class ChargingHelper {
 		if (mEntity == null){
 			return false;
 		}
-		Utils.LOG_INFO("trying to remove player from map");
+		Utils.LOG_WARNING("trying to remove player from map");
 		if (mValidPlayers.containsKey(mPlayer)){
-			Utils.LOG_INFO("key found, removing");
+			Utils.LOG_WARNING("key found, removing");
 			Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode());
 			if (mValidPlayers.remove(mPlayer, mEntry)){
-				Utils.LOG_INFO("Removed a Player to the Tick Map.");
+				Utils.LOG_WARNING("Removed a Player to the Tick Map.");
 				return true;
 			}
 			else {
-				Utils.LOG_INFO("Tried to remove player but it was not there?");
+				Utils.LOG_WARNING("Tried to remove player but it was not there?");
 				return false;
 			}
 		}
 		else {
-			Utils.LOG_INFO("Key does not contain player?");
+			Utils.LOG_WARNING("Key does not contain player?");
 			return false;
 		}
 	}
@@ -267,17 +267,17 @@ public class ChargingHelper {
 		for (ItemStack mTemp : mItems){
 			mItemSlot++;
 			if (mTemp != null){
-				Utils.LOG_INFO("Slot "+mItemSlot+" contains "+mTemp.getDisplayName());
+				Utils.LOG_WARNING("Slot "+mItemSlot+" contains "+mTemp.getDisplayName());
 			}
 			//Is item Electrical
 			if (isItemValid(mTemp)){
-				Utils.LOG_INFO("1");
+				Utils.LOG_WARNING("1");
 
 				//Transfer Limit
 				double mItemEuTLimit = ((IElectricItem) mTemp.getItem()).getTransferLimit(mTemp);
 				//Check if Tile has more or equal EU to what can be transferred into the item.
 				if (mEuStored >= mItemEuTLimit){
-					Utils.LOG_INFO("2");
+					Utils.LOG_WARNING("2");
 
 					double mItemMaxCharge = ((IElectricItem) mTemp.getItem()).getMaxCharge(mTemp);
 					double mitemCurrentCharge = ElectricItem.manager.getCharge(mTemp);
@@ -288,7 +288,7 @@ public class ChargingHelper {
 
 					//Try get charge direct from NBT for GT and IC2 stacks
 					try { 
-						Utils.LOG_INFO("3");						
+						Utils.LOG_WARNING("3");						
 						if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01 
 								|| mTemp.getItem() instanceof GT_MetaGenerated_Item_01 
 								|| mTemp.getItem() instanceof GT_MetaGenerated_Item_02 
@@ -326,7 +326,7 @@ public class ChargingHelper {
 						mVoltageIncrease = mItemEuTLimit;
 					}
 
-					Utils.LOG_INFO("4");
+					Utils.LOG_WARNING("4");
 
 					int mMulti;
 					if ((mitemCurrentCharge + (mVoltageIncrease*20)) <= (mItemMaxCharge - (mVoltageIncrease*20))){
@@ -341,15 +341,15 @@ public class ChargingHelper {
 					else {
 						mMulti = 1;
 					}
-					Utils.LOG_INFO("5");
+					Utils.LOG_WARNING("5");
 
 
 					int mMultiVoltage = (int) (mMulti*mVoltageIncrease);
 
 					if ((mitemCurrentCharge + mMultiVoltage) <= mItemMaxCharge){
-						Utils.LOG_INFO("6");
+						Utils.LOG_WARNING("6");
 						if (GT_ModHandler.chargeElectricItem(mTemp, mMultiVoltage, mTier, true, false) == 0){
-							Utils.LOG_INFO("6.5");
+							Utils.LOG_WARNING("6.5");
 							for (int i=0; i<mMulti;i++){
 								if (ElectricItem.manager.charge(mTemp, mVoltageIncrease, mTier, false, false) == 0){
 									continue;
@@ -357,10 +357,10 @@ public class ChargingHelper {
 							}
 						}
 						if (ElectricItem.manager.getCharge(mTemp) > mitemCurrentCharge){
-							Utils.LOG_INFO("7");
+							Utils.LOG_WARNING("7");
 							mEntity.setEUVar((long) (mEuStored-(mVoltage*mMulti)));
 							mEuStored = mEntity.getEUVar();
-							Utils.LOG_INFO("Charged "+mTemp.getDisplayName()+" | Slot: "+mItemSlot+" | EU Multiplier: "+mMulti+" | EU/t input: "+mVoltageIncrease+" | EU/t consumed by Tile: "+mVoltage+" | Item Max Charge: "+mItemMaxCharge+" | Item Start Charge: "+mitemCurrentCharge+" | Item New Charge"+ElectricItem.manager.getCharge(mTemp));
+							Utils.LOG_WARNING("Charged "+mTemp.getDisplayName()+" | Slot: "+mItemSlot+" | EU Multiplier: "+mMulti+" | EU/t input: "+mVoltageIncrease+" | EU/t consumed by Tile: "+mVoltage+" | Item Max Charge: "+mItemMaxCharge+" | Item Start Charge: "+mitemCurrentCharge+" | Item New Charge"+ElectricItem.manager.getCharge(mTemp));
 							mChargedItems++;
 						}
 					}
@@ -370,7 +370,7 @@ public class ChargingHelper {
 			}
 			else {
 				if (mTemp != null){
-					Utils.LOG_INFO("Found Non-Valid item. "+mTemp.getDisplayName());
+					Utils.LOG_WARNING("Found Non-Valid item. "+mTemp.getDisplayName());
 				}
 			}
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index a2714c4bab..0bd3e6b3bd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -45,6 +45,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 				"Mixed: Provides both 2A of long range and 1A per player locally.",
 				"Mixed mode is more conservative of power and as a result only",
 				"gets half the distances each singular mode gets.",
+				"Long-Range mode currently disabled.",
 				CORE.GT_Tooltip};
 	}
 
@@ -158,7 +159,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 			this.mMode++;
 		}
 		if (this.mMode == 0){
-			PlayerUtils.messagePlayer(aPlayer, "Now in Long-Range Mode.");				
+			PlayerUtils.messagePlayer(aPlayer, "Now in Long-Range Mode. [Disabled]");				
 		}
 		else if (this.mMode == 1){
 			PlayerUtils.messagePlayer(aPlayer, "Now in Local Charge Mode.");				
@@ -394,7 +395,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 									}
 								}
 							}
-							if (this.mMode == 0 || this.mMode == 2){
+							/*if (this.mMode == 0 || this.mMode == 2){
 								int tempRange = (int) (this.mMode == 0 ? 4*GT_Values.V[this.mTier] : 2*GT_Values.V[this.mTier]);
 								if (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp)) < tempRange){
 									if (!mWirelessChargingMap.containsKey(mTemp)){
@@ -411,7 +412,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 										}
 									}
 								}
-							} 
+							} */
 
 						}
 					}
@@ -487,7 +488,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 
 		}
 		else {
-			PlayerUtils.messagePlayer(aPlayer, "Long-range Mode: "+tempRange+"m");	
+			PlayerUtils.messagePlayer(aPlayer, "Long-range Mode: "+tempRange+"m [Disabled]");	
 
 		}