update 5.08.14

4 files changed, 41 insertions, 11 deletions

diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 9c27b3f34a..72d613d225 100644
--- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -3,6 +3,7 @@
 /*   3:    */ import forestry.api.genetics.AlleleManager;

 /*   4:    */ import forestry.api.genetics.IAlleleRegistry;

 /*   5:    */ import forestry.api.genetics.IIndividual;

+import gregtech.GT_Mod;

 /*   6:    */ import gregtech.api.GregTech_API;

 /*   7:    */ import gregtech.api.enums.Element;

 /*   8:    */ import gregtech.api.enums.GT_Values;

@@ -132,7 +133,6 @@ import gregtech.api.util.GT_Recipe;
 /* 128:101 */           this.mOutputItems[0] = ItemList.Tool_DataOrb.get(1L, new Object[0]);

 /* 129:102 */           Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Elemental-Scan");

 /* 130:103 */           Behaviour_DataOrb.setDataName(this.mOutputItems[0], tData.mMaterial.mMaterial.mElement.name());

-/* 131:    */           

 /* 132:105 */           this.mMaxProgresstime = ((int)(tData.mMaterial.mMaterial.getMass() * 8192L / (1 << this.mTier - 1)));

 /* 133:106 */           this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

 /* 134:107 */           return 2;

@@ -174,6 +174,16 @@ import gregtech.api.util.GT_Recipe;
 /* 170:    */     }

 /* 171:140 */     return 0;

 /* 172:    */   }

+

+@Override

+public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

+	if (mProgresstime>=(mMaxProgresstime-1)) {try{

+		if(this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")){

+		GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");}}catch (Exception e){}

+	}

+	super.onPostTick(aBaseMetaTileEntity, aTick);

+}

+

 /* 173:    */   

 /* 174:    */   public GT_Recipe.GT_Recipe_Map getRecipeList()

 /* 175:    */   {

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
index b139161228..d1b5ea8ec9 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
@@ -226,13 +226,13 @@ import gregtech.api.enums.Textures;
 /* 224:    */         {

 /* 225:151 */           if (++this.mProgresstime >= this.mMaxProgresstime)

 /* 226:    */           {

-						  GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel");

-/* 227:152 */             addOutputProducts();

+						  addOutputProducts();

 /* 228:153 */             this.mOutputItem1 = null;

 /* 229:154 */             this.mOutputItem2 = null;

 /* 230:155 */             this.mProgresstime = 0;

 /* 231:156 */             this.mMaxProgresstime = 0;

-/* 232:    */           }

+/* 232:    */             try{GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel");}catch(Exception e){}

+/* 227:152 */			}

 /* 233:    */         }

 /* 234:159 */         else if (aBaseMetaTileEntity.isAllowedToWork()) {

 /* 235:159 */           checkRecipe();

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 53e870931e..fd02e50e2c 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -1,6 +1,7 @@
 /*   1:    */ package gregtech.common.tileentities.machines.multi;

 /*   2:    */ 

-/*   3:    */ import gregtech.api.enums.Materials;

+/*   3:    */ import gregtech.GT_Mod;

+import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

 /*   4:    */ import gregtech.api.enums.Textures.BlockIcons;

 /*   5:    */ import gregtech.api.gui.GT_GUIContainer_MultiMachine;

@@ -150,6 +151,18 @@ import gregtech.api.enums.Textures;
 /* 147:    */     }

 /* 148:126 */     return true;

 /* 149:    */   }

+

+private boolean firstRun = true;

+

+@Override

+public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

+	if (mProgresstime>0&&firstRun) {firstRun = false;try{

+		GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "extremepressure");}catch (Exception e){}

+	}

+	super.onPostTick(aBaseMetaTileEntity, aTick);

+}

+

+

 /* 150:    */   

 /* 151:    */   public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack)

 /* 152:    */   {

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
index 9d15000b36..5dfee91ff9 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
@@ -19,14 +19,21 @@ public class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_MultiBlock
 	public GT_MetaTileEntity_LargeTurbine(String aName){super(aName);}
 
 	@Override
-	public String[] getDescription() {
-		return new String[]{"Consumes 1600 Liters of Steam per Tick"};
-	}
-
-	@Override
 	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_SIDE)};
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex+1], aFacing == aSide ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
 	}
+	
+	   
+	   public String[] getDescription()
+	   {
+	     return new String[] { 
+	    		 "Controller Block for the Large Turbine",
+	    		 "Size: 3x3x4 (Hollow)", "Controller (front centered)",
+	    		 "1x Input Hatch (side centered)", "1x Output Hatch(side centered)",
+	    		 "1x Dynamo Hatch (back centered)", 
+	    		 "1x Maintenance Hatch (side centered)", 
+	    		 "Turbine Casings for the rest (24 at least!)" };
+	   }
 
 	@Override
 	public boolean isCorrectMachinePart(ItemStack aStack) {