$ Compatibility Fixes.

- Removed Ore-Regeneration command.

4 files changed, 30 insertions, 37 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
index cea9d8eb2f..fcefd101b2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
@@ -337,7 +337,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
-        if(!GT_Mod.gregtechproxy.mForceFreeFace) {
+        if(!false) {
         	aBaseMetaTileEntity.openGUI(aPlayer);
         	return true;
         }
@@ -439,7 +439,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
                     }
                     if (mProgresstime > 5) mStuttering = false;
                     XSTR aXSTR = new XSTR();
-                    if(GT_Mod.gregtechproxy.mAprilFool && aXSTR.nextInt(5000)==0)GT_Utility.sendSoundToPlayers(aBaseMetaTileEntity.getWorld(), GregTech_API.sSoundList.get(5), 10.0F, -1.0F, aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord());
+                    if(false && aXSTR.nextInt(5000)==0)GT_Utility.sendSoundToPlayers(aBaseMetaTileEntity.getWorld(), GregTech_API.sSoundList.get(5), 10.0F, -1.0F, aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord());
                 } else {
                     if (!mStuttering) {
                         stutterProcess();
@@ -721,7 +721,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aSide == getBaseMetaTileEntity().getFrontFacing() || aSide == mMainFacing) {
             mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
-            GT_Utility.sendChatToPlayer(aPlayer, mAllowInputFromOutputSide ? trans("095","Input from Output Side allowed") : trans("096","Input from Output Side forbidden"));
+            GT_Utility.sendChatToPlayer(aPlayer, mAllowInputFromOutputSide ? ("Input from Output Side allowed") : ("Input from Output Side forbidden"));
         }
     }
 
@@ -785,7 +785,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
         GT_Recipe tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), getAllInputs());
         if (tRecipe == null) return DID_NOT_FIND_RECIPE;
 
-        if (GT_Mod.gregtechproxy.mLowGravProcessing && tRecipe.mSpecialValue == -100 &&
+        if (false && tRecipe.mSpecialValue == -100 &&
                 !isValidForLowGravity(tRecipe,getBaseMetaTileEntity().getWorld().provider.dimensionId))
             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
index 24a92fd628..9c93ca3889 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
@@ -12,6 +12,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.hatches.charge.CONTAINER_Electric_2by2;
 import gtPlusPlus.xmod.gregtech.api.gui.hatches.charge.CONTAINER_Electric_4by4;
@@ -29,10 +30,7 @@ GT_MetaTileEntity_Hatch {
 
 	public GT_MetaTileEntity_Hatch_InputBattery(int aID, String aName,
 			String aNameRegional, int aTier) {
-		super(aID, aName, aNameRegional, aTier, getSlots(aTier),
-				new String[]{"Chargeable Item Bus for Multiblocks",
-						"Capacity: " + getSlots(aTier) + " stack"
-								+ (getSlots(aTier) >= 2 ? "s" : "")});
+		super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Chargeable Item Bus for Multiblocks");
 	}
 
 	public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier,
@@ -42,11 +40,9 @@ GT_MetaTileEntity_Hatch {
 						aDescription, aTextures);
 	}
 
-	public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier,
-			String[] aDescription, ITexture[][][] aTextures) {
-		super(aName, aTier,
-				aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 4 : 16,
-						aDescription, aTextures);
+	@Override
+	public String[] getDescription() {
+		return new String[]{this.mDescription, "Capacity: " + getSlots(this.mTier) + " stack"+ (getSlots(this.mTier) >= 2 ? "s" : ""), CORE.GT_Tooltip};
 	}
 
 	@Override
@@ -115,7 +111,7 @@ GT_MetaTileEntity_Hatch {
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier,
-				mDescriptionArray, mTextures);
+				mDescription, mTextures);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
index 5dd333e2fa..aa234a3dc9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
@@ -10,6 +10,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.hatches.charge.CONTAINER_Electric_2by2;
 import gtPlusPlus.xmod.gregtech.api.gui.hatches.charge.CONTAINER_Electric_4by4;
@@ -26,9 +27,7 @@ GT_MetaTileEntity_Hatch {
 	public GT_MetaTileEntity_Hatch_OutputBattery(int aID, String aName,
 			String aNameRegional, int aTier) {
 		super(aID, aName, aNameRegional, aTier, getSlots(aTier),
-				new String[]{"Dischargeable Item Bus for Multiblocks",
-						"Capacity: " + getSlots(aTier) + " stack"
-								+ (getSlots(aTier) >= 2 ? "s" : "")});
+				"Dischargeable Item Bus for Multiblocks");
 	}
 
 	public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier,
@@ -38,22 +37,21 @@ GT_MetaTileEntity_Hatch {
 						aDescription, aTextures);
 	}
 
-	public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier,
-			String[] aDescription, ITexture[][][] aTextures) {
-		super(aName, aTier,
-				aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16,
-						aDescription, aTextures);
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{this.mDescription, "Capacity: " + getSlots(this.mTier) + " stack"+ (getSlots(this.mTier) >= 2 ? "s" : ""), CORE.GT_Tooltip};
 	}
 
 	@Override
 	public boolean isEnetOutput() {
 		return true;
 	}
-	
+
 	@Override
-    public boolean isOutputFacing(byte aSide) {
-        return aSide == getBaseMetaTileEntity().getFrontFacing();
-    }
+	public boolean isOutputFacing(byte aSide) {
+		return aSide == getBaseMetaTileEntity().getFrontFacing();
+	}
 
 	@Override
 	public long getMinimumStoredEU() {
@@ -105,7 +103,7 @@ GT_MetaTileEntity_Hatch {
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier,
-				mDescriptionArray, mTextures);
+				mDescription, mTextures);
 	}
 
 	@Override
@@ -195,14 +193,14 @@ GT_MetaTileEntity_Hatch {
 	public int dechargerSlotCount() {
 		return mTier == 2 ? 4 : 16;
 	}
-	
+
 	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity,	long aTimer) {
 		if (aBaseMetaTileEntity.isServerSide()
 				&& aBaseMetaTileEntity.hasInventoryBeenModified()) {
 			fillStacksIntoFirstSlots();
 		}		
-		
+
 		if (aBaseMetaTileEntity.isServerSide()){
 			if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
 				MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity();				
@@ -220,7 +218,6 @@ GT_MetaTileEntity_Hatch {
 		}
 		super.onPostTick(aBaseMetaTileEntity, aTimer);
 	}
-	
-	
+
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index bf7dc58db3..b1ee632c88 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -243,8 +243,8 @@ GT_MetaTileEntity_MultiBlockBase {
 			return false;
 		}
 		if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBattery) {
-			((GT_MetaTileEntity_Hatch) aMetaTileEntity)
-			.updateTexture(aBaseCasingIndex);
+			//((GT_MetaTileEntity_Hatch) aMetaTileEntity);
+			//.updateTexture(aBaseCasingIndex);
 			return this.mChargeHatches.add(
 					(GT_MetaTileEntity_Hatch_InputBattery) aMetaTileEntity);
 		}
@@ -261,8 +261,8 @@ GT_MetaTileEntity_MultiBlockBase {
 			return false;
 		}
 		if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBattery) {
-			((GT_MetaTileEntity_Hatch) aMetaTileEntity)
-			.updateTexture(aBaseCasingIndex);
+			//((GT_MetaTileEntity_Hatch) aMetaTileEntity)
+			//.updateTexture(aBaseCasingIndex);
 			return this.mDischargeHatches.add(
 					(GT_MetaTileEntity_Hatch_OutputBattery) aMetaTileEntity);
 		}
@@ -279,7 +279,7 @@ GT_MetaTileEntity_MultiBlockBase {
 			return false;
 		}
 		if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-			((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+			//((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
 			((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = this.getRecipeMap();
 			return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
 		}
@@ -295,7 +295,7 @@ GT_MetaTileEntity_MultiBlockBase {
 			return false;
 		}
 		if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {
-			((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+			//((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
 			return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
 		}
 		return false;