$ Fixed Thermal Centrifuge Structure check.

$ Moved all SubscribeEvents to it's own handler function.
% Adjusted tooltips of the Thermal Plant and the Wash Plant to reflect their actual dimensions.

3 files changed, 6 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
index 2ffa242fc2..7826e9fcfe 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -8,15 +8,12 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
@@ -44,7 +41,7 @@ extends GregtechMeta_MultiBlockBase {
 		return new String[]{
 				"Controller Block for the Industrial Thermal Centrifuge",
 				"60% faster than using single block machines of the same voltage",
-				"Size: 3x2x3 [WxLxH] (Hollow)", "Controller (front centered)",
+				"Size: 3x2x3 [WxHxL]", "Controller (front centered)",
 				"1x Input Bus (Any casing)",
 				"1x Output Bus (Any casing)",
 				"1x Maintenance Hatch (Any casing)",
@@ -143,8 +140,8 @@ extends GregtechMeta_MultiBlockBase {
 		int tAmount = 0;
 		for (int i = -1; i < 2; ++i) {
 			for (int j = -1; j < 2; ++j) {
-				for (int h = -1; h < 1; ++h) {
-					if ((h != 0) || ((((xDir + i != 0) || (zDir + j != 0))) && (((i != 0) || (j != 0))))) {
+				for (int h = -1; h < 0; ++h) {
+					//if ((h != 0) || ((((xDir + i != 0) || (zDir + j != 0))) && (((i != 0) || (j != 0))))) {
 						IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h,
 								zDir + j);
 						if (!addToMachineList(tTileEntity)) {
@@ -157,7 +154,7 @@ extends GregtechMeta_MultiBlockBase {
 							}
 							++tAmount;
 						}
-					}
+					//}
 				}
 			}
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
index 9b7927c5ad..3309010054 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -48,7 +48,7 @@ extends GregtechMeta_MultiBlockBase {
 		return new String[]{
 				"Controller Block for the Industrial Ore Washing Plant",
 				"80% faster than using single block machines of the same voltage",
-				"Size: 7x2x5 [WxHxL] (open)",
+				"Size: 7x3x5 [WxHxL] (open)",
 				"X     X",
 				"X     X",
 				"XXXXX",
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index 48d516e4cf..6e7e71e5b9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -1,12 +1,10 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
-import net.minecraftforge.common.MinecraftForge;
 
 public class GregtechWirelessChargers {
 
@@ -21,8 +19,7 @@ public class GregtechWirelessChargers {
 					| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
 			int mID = 890;		
 
-			FMLCommonHandler.instance().bus().register(new ChargingHelper());
-			MinecraftForge.EVENT_BUS.register(new ChargingHelper());
+			Utils.registerEvent(new ChargingHelper());
 
 			GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.01.tier.single",
 					"Wireless Charger MK I", 1, "Hopefully won't give you cancer.", 0).getStackForm(1L));