diff options
Diffstat (limited to 'main/java/gregtech/common')
3 files changed, 8 insertions, 5 deletions
diff --git a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java index c6f588a34f..081550a56b 100644 --- a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java +++ b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java @@ -10,10 +10,12 @@ import gregtech.api.util.GT_Utility; public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machine { String mName = ""; + public String mNEI; - public GT_GUIContainer_FusionReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { + public GT_GUIContainer_FusionReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile, String aNEI) { super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity, false), RES_PATH_GUI + "multimachines/" + (aTextureFile==null?"MultiblockDisplay":aTextureFile)); mName = aName; + mNEI = aNEI; } @Override diff --git a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java index 90acb38dd4..265a8b8117 100644 --- a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java +++ b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java @@ -139,7 +139,9 @@ public class GT_MetaTileEntity_TypeFilter {
boolean tAllowPrefix = this.mPrefix.contains(aStack);
if(this.mPrefix==OrePrefixes.ore){
- OrePrefixes tFix = GT_OreDictUnificator.getItemData(aStack).mPrefix;
+ ItemData tData = GT_OreDictUnificator.getItemData(aStack);
+ if(tData!=null&&tData.mPrefix!=null){
+ OrePrefixes tFix = tData.mPrefix;
if(tFix==OrePrefixes.oreBlackgranite||
tFix==OrePrefixes.oreDense||
tFix==OrePrefixes.oreEnd||
@@ -151,7 +153,7 @@ public class GT_MetaTileEntity_TypeFilter tFix==OrePrefixes.oreRedgranite||
tFix==OrePrefixes.oreRich||
tFix==OrePrefixes.oreSmall)tAllowPrefix=true;
- }
+ }}
return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && ((this.bNBTAllowed) || (!aStack.hasTagCompound())) && (tAllowPrefix != this.bInvertFilter);
}
}
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 9a835e625f..8a5a1d6b84 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -60,7 +60,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity @Override public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "FusionComputer.png"); + return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "FusionComputer.png", GT_Recipe.GT_Recipe_Map.sFusionRecipes.mNEIName); } public abstract MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity); @@ -283,7 +283,6 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity return false; } if (mRunningOnLoad||tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[] {})) { - if(mRunningOnLoad)System.out.println("First Recipe!"); this.mLastRecipe = tRecipe; this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue)); this.mMaxProgresstime = this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue); |