$ Fixed Tooltips, Mode Changing and Info Messages on the Wireless Charger.

$ Fixed bad tier registration with the Wireless Charger.

2 files changed, 34 insertions, 38 deletions

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 7239dc41ac..7d71ae9b54 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
@@ -37,8 +37,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 	public String[] getDescription() {
 		return new String[] {this.mDescription,
 				"3 Modes, Long-Range, Local and Mixed.", 
-				"Long-Range: Can supply 2A of power to a single player upto "+(this.mTier*4)+"m away.",
-				"Local: Can supply 1A to each player within 50m.",
+				"Long-Range: Can supply 2A of power to a single player upto "+(GT_Values.V[this.mTier]*4)+"m away.",
+				"Local: Can supply 1A to each player within "+this.mTier*10+"m.",
 				"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.",
@@ -70,52 +70,52 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 
 
 	public ITexture[] getFront(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)};
 	}
 
 
 	public ITexture[] getBack(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getBottom(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getTop(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getSides(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getFrontActive(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)};
 	}
 
 
 	public ITexture[] getBackActive(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getBottomActive(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getTopActive(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 
 	public ITexture[] getSidesActive(final byte aColor) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier+3][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
 	}
 
 	@Override
@@ -343,14 +343,12 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 							EntityPlayer mTemp = (EntityPlayer) mTempPlayer;
 
 							if (this.mMode == 1 || this.mMode == 2){
-								int tempRange = (this.mMode == 1 ? 50 : 25);
+								int tempRange = (this.mMode == 1 ? this.mTier*10 : this.mTier*5);
 								if (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp)) < tempRange){
 									if (!mLocalChargingMap.containsKey(mTemp.getPersistentID())){
-										if (mLocalChargingMap.put(mTemp.getPersistentID(), mTemp) != null){
-											PlayerUtils.messagePlayer(mTemp, "You have entered charging range. ["+tempRange+"m].");
-										}
+										mLocalChargingMap.put(mTemp.getPersistentID(), mTemp);
+										PlayerUtils.messagePlayer(mTemp, "You have entered charging range. ["+tempRange+"m].");
 									}
-
 								}
 								else {
 									if (mLocalChargingMap.containsKey(mTemp.getPersistentID())){
@@ -364,11 +362,9 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 								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)){
-										if (mWirelessChargingMap.put(mTemp, mTemp.getPersistentID()) != null){
-											PlayerUtils.messagePlayer(mTemp, "You have entered charging range. ["+tempRange+"m].");
-										}
+										mWirelessChargingMap.put(mTemp, mTemp.getPersistentID());
+										PlayerUtils.messagePlayer(mTemp, "You have entered charging range. ["+tempRange+"m].");
 									}
-
 								}
 								else {
 									if (mWirelessChargingMap.containsKey(mTemp)){
@@ -421,28 +417,28 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 	@Override
 	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity,
 			EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
-		
+
 		int tempRange;
-		
+
 		if (this.mMode == 0 || this.mMode == 2){
 			tempRange = (int) (this.mMode == 0 ? 4*GT_Values.V[this.mTier] : 2*GT_Values.V[this.mTier]);			
 		}
 		else {
-			tempRange = 50;			
+			tempRange = this.mMode == 1 ? this.mTier*10 : this.mTier*5;			
 		}
-		
+
 		if (this.mMode == 2){
-			PlayerUtils.messagePlayer(aPlayer, "Mixed Mode | Local: 25m | Long: "+tempRange);	
+			PlayerUtils.messagePlayer(aPlayer, "Mixed Mode | Local: "+this.mTier*5+"m | Long: "+tempRange+"m");	
 		}
 		else if (this.mMode == 1){
-			PlayerUtils.messagePlayer(aPlayer, "Local Mode: 50m");	
-			
+			PlayerUtils.messagePlayer(aPlayer, "Local Mode: "+this.mTier*10+"m");	
+
 		}
 		else {
 			PlayerUtils.messagePlayer(aPlayer, "Long-range Mode: "+tempRange+"m");	
-			
+
 		}
-		
+
 		return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ);
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index f23dc3ab3d..538112d365 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -18,23 +18,23 @@ public class GregtechWirelessChargers {
 		int mID = 890;
 		
 		GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.01.tier.single",
-				"Wireless Charger MK I", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK I", 1, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_MV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.02.tier.single",
-				"Wireless Charger MK II", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK II", 2, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_HV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.03.tier.single",
-				"Wireless Charger MK III", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK III", 3, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_EV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.04.tier.single",
 				"Wireless Charger MK IV", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_IV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.05.tier.single",
-				"Wireless Charger MK V", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK V", 5, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_LuV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.06.tier.single",
-				"Wireless Charger MK VI", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK VI", 6, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_ZPM.set(new GregtechMetaWirelessCharger(mID++, "wificharger.07.tier.single",
-				"Wireless Charger MK VII", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK VII", 7, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_UV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.08.tier.single",
-				"Wireless Charger MK VIII", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK VIII", 8, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 		GregtechItemList.Charger_MAX.set(new GregtechMetaWirelessCharger(mID++, "wificharger.09.tier.single",
-				"Wireless Charger MK IX", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+				"Wireless Charger MK IX", 9, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 
 	}