Version 5.08.22-23

9 files changed, 41 insertions, 12 deletions

diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java
index 22d66a5826..64b1625b89 100644
--- a/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/main/java/gregtech/common/GT_RecipeAdder.java
@@ -10,7 +10,10 @@ import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+
 import java.util.ArrayList;
+
+import crazypants.enderio.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
@@ -123,7 +126,7 @@ public class GT_RecipeAdder
   
   public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt)
   {
-    if ((aInput1 == null) || (aOutput1 == null)) {
+    if ((aInput1 == null) || (aOutput1 == null || Materials.Graphite.contains(aInput1))) {
       return false;
     }
     if ((aInput2 == null) && ((OrePrefixes.ingot.contains(aInput1)) || (OrePrefixes.dust.contains(aInput1)) || (OrePrefixes.gem.contains(aInput1)))) {
diff --git a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index 07976c8ee2..6edce96441 100644
--- a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -60,7 +60,7 @@ public class GT_TileEntity_Ores
   public Packet getDescriptionPacket()

   {

     if (!this.worldObj.isRemote) {

-      if (GT_Utility.isBlockOccluded(worldObj, xCoord, yCoord, zCoord, false, true)) {

+    	if ((this.mBlocked == (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord + 1, this.yCoord, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord - 1, this.yCoord, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord - 1, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord, this.zCoord + 1)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord, this.zCoord - 1)) ? 1 : 0) == 0) {

         GT_Values.NW.sendPacketToAllPlayersInRange(this.worldObj, new GT_Packet_Ores(this.xCoord, (short)this.yCoord, this.zCoord, this.mMetaData), this.xCoord, this.zCoord);

       }

     }

diff --git a/main/java/gregtech/common/items/GT_DepletetCell_Item.java b/main/java/gregtech/common/items/GT_DepletetCell_Item.java
index dbc049f1c0..84c38db6b7 100644
--- a/main/java/gregtech/common/items/GT_DepletetCell_Item.java
+++ b/main/java/gregtech/common/items/GT_DepletetCell_Item.java
@@ -7,7 +7,7 @@ import gregtech.api.items.GT_RadioactiveCellIC_Item;
 public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item{
 
 	public GT_DepletetCell_Item(String aUnlocalized, String aEnglish, int aRadiation) {
-		super(aUnlocalized, aEnglish, 1, 1, 0, aRadiation);}
+		super(aUnlocalized, aEnglish, 1, 1, 0, aRadiation,0);}
 	
 	  public void processChamber(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, boolean paramBoolean){}
 	  
diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
index cbc8d1ee52..7b084c1223 100644
--- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
+++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.generators;

 

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.Textures;

 import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

@@ -13,6 +15,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 public class GT_MetaTileEntity_FluidNaquadahReactor

   extends GT_MetaTileEntity_BasicGenerator

 {

+	public int mEfficiency;

   public boolean isOutputFacing(byte aSide)

   {

     return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing());

@@ -20,12 +23,12 @@ public class GT_MetaTileEntity_FluidNaquadahReactor
   

   public GT_MetaTileEntity_FluidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier)

   {

-    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);

+    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);onConfigLoad();

   }

   

   public GT_MetaTileEntity_FluidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

   {

-    super(aName, aTier, aDescription, aTextures);

+    super(aName, aTier, aDescription, aTextures);onConfigLoad();

   }

   

   public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

@@ -45,9 +48,14 @@ public class GT_MetaTileEntity_FluidNaquadahReactor
   

   public int getEfficiency()

   {

-    return 100;

+    return mEfficiency;

   }

   

+  public void onConfigLoad()

+  {

+				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "FluidNaquadah.efficiency.tier."+this.mTier, 100);

+}

+  

   public ITexture[] getFront(byte aColor)

   {

     return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT) };

diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
index 4e85dbfe92..945d0ad084 100644
--- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
+++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.generators;

 

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.Textures;

 import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

@@ -13,6 +15,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 public class GT_MetaTileEntity_SolidNaquadahReactor

   extends GT_MetaTileEntity_BasicGenerator

 {

+	public int mEfficiency;

   public boolean isOutputFacing(byte aSide)

   {

     return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing());

@@ -20,12 +23,12 @@ public class GT_MetaTileEntity_SolidNaquadahReactor
   

   public GT_MetaTileEntity_SolidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier)

   {

-    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Bolts", new ITexture[0]);

+    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Bolts", new ITexture[0]);onConfigLoad();

   }

   

   public GT_MetaTileEntity_SolidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

   {

-    super(aName, aTier, aDescription, aTextures);

+    super(aName, aTier, aDescription, aTextures);onConfigLoad();

   }

   

   public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

@@ -45,9 +48,14 @@ public class GT_MetaTileEntity_SolidNaquadahReactor
   

   public int getEfficiency()

   {

-    return 80;

+    return mEfficiency;

   }

   

+  public void onConfigLoad()

+  {

+				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier."+this.mTier, 80);

+}

+  

   public ITexture[] getFront(byte aColor)

   {

     return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) };

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index 9e4d31e33b..48bd34bf0c 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
 		    int tEU=0;
 		    int distOut=0;
 		    for(int i=0;i<steams.size();i++){
-		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.ic2superheatedsteam")){
+		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSuperheatedSteam")){
 		    		int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
 		    		depleteInput(new FluidStack(steams.get(i),out));
 		    		distOut += out;
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index dc88d453d0..0f20246eed 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 		    int tEU=0;
 		    int distOut=0;
 		    for(int i=0;i<steams.size();i++){
-		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.steam")||steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.ic2steam")){
+		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.steam")||steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSteam")){
 		    		int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
 		    		depleteInput(new FluidStack(steams.get(i),out));
 		    		distOut += out/160;
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 6bc1f36794..fa9ee5e949 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -38,7 +38,16 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 				  
 				  public String[] getDescription()
 				  {
-				    return new String[] { "Controller Block for the Processing Array", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Robust Tungstensteel Casings for the rest (16 at least!)","Put up to 16 Basic Machines into the GUI Inventory","Currently only fluid Centrifuge Recipes work correctly","Make Deuterium/Tritium with it." };
+				    return new String[] { "Controller Block for the Processing Array", 
+				    					  "Size: 3x3x3 (Hollow)", 
+				    					  "Controller (front centered)", 
+				    					  "1x Input (anywhere)", 
+				    					  "1x Output (anywhere)", 
+				    					  "1x Energy Hatch (anywhere)", 
+				    					  "1x Maintenance Hatch (anywhere)", 
+				    					  "Robust Tungstensteel Casings for the rest (16 at least!)",
+				    					  "Place up to 16 Single Block GT Machines into the GUI Inventory",
+				    					  "They will work the same way as placed directly in world"};
 				  }
 				  
 				  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java
index bf79012661..89df4bfc85 100644
--- a/main/java/gregtech/common/tools/GT_Tool_Turbine.java
+++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java
@@ -22,4 +22,5 @@ public abstract class GT_Tool_Turbine extends GT_Tool{
 	 }  
 	   public abstract float getSpeedMultiplier();
 	   public abstract float getMaxDurabilityMultiplier();
+	   public ItemStack getBrokenItem(ItemStack aStack){return null;}
 }