diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-05-26 00:52:09 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-05-26 00:52:09 +0100 |
| commit | fced86e11af35318bf3ef4129dd5a6584ad079e0 (patch) | |
| tree | c028fe71e67144a21c5e0662c3c8816725083d01 /src | |
| parent | ab6c431b880641f287e68c5e9a24cf5fe6bf39d2 (diff) | |
| download | GT5-Unofficial-fced86e11af35318bf3ef4129dd5a6584ad079e0.tar.gz GT5-Unofficial-fced86e11af35318bf3ef4129dd5a6584ad079e0.tar.bz2 GT5-Unofficial-fced86e11af35318bf3ef4129dd5a6584ad079e0.zip | |
Fixes #268. Shows plasma cells that have a fusion recipe
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 479ed9aafb..5c480569c4 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -14,6 +14,7 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.*;
import gregtech.common.covers.*;
import gregtech.common.items.behaviors.*;
+import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.entity.item.EntityItem;
@@ -24,7 +25,9 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.util.MathHelper;
+import net.minecraftforge.fluids.FluidStack;
+import java.util.Collection;
import java.util.List;
public class GT_MetaGenerated_Item_01
@@ -813,8 +816,18 @@ public class GT_MetaGenerated_Item_01 }
}
+ public boolean isPlasmaCellUsed(OrePrefixes aPrefix, Materials aMaterial) {
+ Collection<GT_Recipe> fusionRecipes = GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList;
+ if(aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { //Materials has a plasma fluid
+ for(GT_Recipe recipe : fusionRecipes) { //Loop through fusion recipes
+ if(recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) return true; //Fusion recipe output matches current plasma cell fluid
+ }
+ }
+ return false;
+ }
+
public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) {
- return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && (aPrefix != OrePrefixes.cellPlasma));
+ return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && isPlasmaCellUsed(aPrefix, aMaterial));
}
public ItemStack getContainerItem(ItemStack aStack) {
|