1 files changed, 30 insertions, 30 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java
index 141f4bbc43..64925c9bb1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java
@@ -11,34 +11,34 @@ 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_TieredMachineBlock;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTESolarTower;
 
-public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTESolarHeater extends MTETieredMachineBlock {
 
     public boolean mHasTower = false;
-    private GregtechMetaTileEntity_SolarTower mTower = null;
+    private MTESolarTower mTower = null;
 
     private int mTX, mTY, mTZ;
     private Byte mRequiredFacing;
 
-    public TileEntitySolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTESolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public TileEntitySolarHeater(final String aName, final int aTier, final String[] aDescription,
+    public MTESolarHeater(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", CORE.GT_Tooltip.get());
+        return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -68,54 +68,54 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0);
+        return new MTESolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0);
     }
 
     @Override
@@ -247,7 +247,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return false;
     }
 
@@ -258,7 +258,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
         return mHasTower;
     }
 
-    public GregtechMetaTileEntity_SolarTower getSolarTower() {
+    public MTESolarTower getSolarTower() {
         if (this.mHasTower) {
             return mTower;
         }
@@ -280,7 +280,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
         return false;
     }
 
-    public boolean setSolarTower(GregtechMetaTileEntity_SolarTower aTowerTile) {
+    public boolean setSolarTower(MTESolarTower aTowerTile) {
         if (!hasSolarTower()) {
             this.mTX = aTowerTile.getBaseMetaTileEntity()
                 .getXCoord();