+ Added in annoying logging.

$ Fixed NPE when tickhandler tries to get null Tile entity.
% Tweaked Stored Energy and A/in/t for Wireless Charger.

2 files changed, 22 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index f4e53bc5dc..41ae1a911b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -37,6 +37,7 @@ public class ChargingHelper {
 	//Called whenever the player is updated or ticked. 
 	@SubscribeEvent(priority = EventPriority.HIGHEST)
 	public void onPlayerTick(LivingUpdateEvent event) {
+		try {
 		if (event.entity != null && event.entityLiving != null){		
 			if (event.entityLiving instanceof EntityPlayer){
 				EntityPlayer mPlayerMan = (EntityPlayer) event.entityLiving;
@@ -133,6 +134,10 @@ public class ChargingHelper {
 				}
 			}
 		}
+		}
+		catch (Throwable t){
+			Utils.LOG_INFO("State of Wireless Charger changed in an invalid way, this prevented a crash.");
+		}
 	}
 
 	public static boolean addEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity){
@@ -256,14 +261,18 @@ public class ChargingHelper {
 
 		for (ItemStack mTemp : mItems){
 			mItemSlot++;
-			Utils.LOG_INFO("Trying to Tick slot "+mItemSlot);
+			if (mTemp != null){
+				Utils.LOG_INFO("Slot "+mItemSlot+" contains "+mTemp.getDisplayName());
+			}
 			//Is item Electrical
 			if (isItemValid(mTemp)){
+				Utils.LOG_INFO("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");
 
 					double mItemMaxCharge = ((IElectricItem) mTemp.getItem()).getMaxCharge(mTemp);
 					double mitemCurrentCharge = ElectricItem.manager.getCharge(mTemp);
@@ -273,7 +282,8 @@ public class ChargingHelper {
 					}
 
 					//Try get charge direct from NBT for GT and IC2 stacks
-					try {
+					try { 
+						Utils.LOG_INFO("3");						
 						if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01 
 								|| mTemp.getItem() instanceof GT_MetaGenerated_Item_01 
 								|| mTemp.getItem() instanceof GT_MetaGenerated_Item_02 
@@ -310,6 +320,8 @@ public class ChargingHelper {
 					else {
 						mVoltageIncrease = mItemEuTLimit;
 					}
+					
+					Utils.LOG_INFO("4");
 
 					int mMulti;
 					if ((mitemCurrentCharge + (mVoltageIncrease*20)) <= (mItemMaxCharge - (mVoltageIncrease*20))){
@@ -324,12 +336,15 @@ public class ChargingHelper {
 					else {
 						mMulti = 1;
 					}
+					Utils.LOG_INFO("5");
 
 
 					int mMultiVoltage = (int) (mMulti*mVoltageIncrease);
 
 					if ((mitemCurrentCharge + mMultiVoltage) <= mItemMaxCharge){
+						Utils.LOG_INFO("6");
 						if (GT_ModHandler.chargeElectricItem(mTemp, mMultiVoltage, mTier, true, false) == 0){
+							Utils.LOG_INFO("6.5");
 							for (int i=0; i<mMulti;i++){
 								if (ElectricItem.manager.charge(mTemp, mVoltageIncrease, mTier, false, false) == 0){
 									continue;
@@ -337,6 +352,7 @@ public class ChargingHelper {
 							}
 						}
 						if (ElectricItem.manager.getCharge(mTemp) > mitemCurrentCharge){
+							Utils.LOG_INFO("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));
@@ -349,7 +365,7 @@ public class ChargingHelper {
 			}
 			else {
 				if (mTemp != null){
-					Utils.LOG_INFO("Found Non-Valid item."+mTemp.getDisplayName());
+					Utils.LOG_INFO("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 1ceb4c6a7b..f0b2958c17 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
@@ -184,7 +184,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 	@Override public boolean isOutputFacing(final byte aSide)				{return aSide==this.getBaseMetaTileEntity().getFrontFacing();}
 	@Override public boolean isTeleporterCompatible()				{return false;}
 	@Override public long getMinimumStoredEU()						{return 0;}
-	@Override public long maxEUStore()								{return GT_Values.V[this.mTier]*32;}
+	@Override public long maxEUStore()								{return GT_Values.V[this.mTier]*128;}
 
 	@Override
 	public int getCapacity() {
@@ -207,10 +207,10 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 			return 2;
 		}
 		else if (this.mMode == 1){
-			return this.mLocalChargingMap.size();
+			return this.mLocalChargingMap.size()*8;
 		}
 		else {
-			return (this.mLocalChargingMap.size()+this.mWirelessChargingMap.size());
+			return ((this.mLocalChargingMap.size()*4)+this.mWirelessChargingMap.size());
 		}
 	}