Skip to content

Commit 8f4b487

Browse files
committed
if that doesnt fix it then i dont know...
1 parent 38db087 commit 8f4b487

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

src/main/java/gregapi/recipes/Recipe.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,9 @@ public Recipe addToItemMap(Recipe aRecipe) {
679679
public boolean mCanBeBuffered = T;
680680
/** If this Recipe needs the Output Slots to be completely empty. Needed in case you have randomised Outputs */
681681
public boolean mNeedsEmptyOutput = F;
682+
/** If this Recipe is not supposed to check for Input NBT Values. Thanks Applied Energistics Crystal Seeds for somehow messing something up somewhere where i cant find it... */
683+
public boolean mNoNBTChecks = F;
684+
682685

683686
public int getOutputChance(long aIndex) {if (aIndex < 0 || aIndex >= mChances.length) return getMaxChance(aIndex); return (int)mChances[(int)aIndex];}
684687
public int getMaxChance(long aIndex) {if (aIndex < 0 || aIndex >= mMaxChances.length) return 10000; return (int)mMaxChances[(int)aIndex];}
@@ -708,6 +711,11 @@ public Recipe setNeedEmptyOut() {
708711
return this;
709712
}
710713

714+
public Recipe setNoNBTChecks() {
715+
mNoNBTChecks = T;
716+
return this;
717+
}
718+
711719
public boolean blockINblockOUT() {
712720
return mInputs.length == 1 && mOutputs.length == 1 && mFluidInputs.length == 0 && mFluidOutputs.length == 0 && ST.block(mInputs[0]) != NB && ST.block(mOutputs[0]) != NB && mInputs[0].stackSize == 1 && mOutputs[0].stackSize == 1;
713721
}
@@ -769,7 +777,7 @@ public boolean checkStacksEqual(boolean aDecreaseStacksizeBySuccess, boolean aDo
769777
for (int i = 0; i < aInputs.length; i++) if (!tChecked[i]) {
770778
ItemStack aInput = aInputs[i];
771779
if (ST.valid(aInput)) {
772-
if ((aDontCheckStackSizes || aInput.stackSize >= tInput.stackSize) && OreDictManager.INSTANCE.equal_(F, aInput, tInput, !tInput.hasTagCompound())) {
780+
if ((aDontCheckStackSizes || aInput.stackSize >= tInput.stackSize) && OreDictManager.INSTANCE.equal_(F, aInput, tInput, mNoNBTChecks || !tInput.hasTagCompound())) {
773781
if (aDecreaseStacksizeBySuccess) aInput.stackSize -= tInput.stackSize;
774782
tChecked[i] = T;
775783
temp = F;
@@ -865,6 +873,7 @@ private Recipe(Recipe aRecipe) {
865873
mSpecialValue = aRecipe.mSpecialValue;
866874
mNeedsEmptyOutput = aRecipe.mNeedsEmptyOutput;
867875
mCanBeBuffered = aRecipe.mCanBeBuffered;
876+
mNoNBTChecks = aRecipe.mNoNBTChecks;
868877
mFakeRecipe = aRecipe.mFakeRecipe;
869878
mEnabled = aRecipe.mEnabled;
870879
mHidden = aRecipe.mHidden;
@@ -931,8 +940,10 @@ public Recipe(boolean aOptimize, boolean aUnificate, boolean aCanBeBuffered, Ite
931940
}
932941
}
933942

943+
mNoNBTChecks = T;
934944
for (int i = 0; i < aInputs .length; i++) if (aInputs [i] != NI) {
935945
if (aInputs [i].stackSize > 64) aInputs [i].stackSize = 64;
946+
if (aInputs [i].hasTagCompound()) mNoNBTChecks = F;
936947
}
937948
for (int i = 0; i < aOutputs.length; i++) if (aOutputs[i] != NI) {
938949
aOutputs[i] = ST.update(aOutputs[i]);

src/main/java/gregtech/compat/Compat_Recipes_AppliedEnergistics.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public class Compat_Recipes_AppliedEnergistics extends CompatMods {
7979
RM.Press .addRecipeX(T, 16, 64, ST.array(ST.make(MD.AE, "item.ItemMultiMaterial", 1, 17), OM.dust(MT.Redstone), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 20)), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 24));
8080
RM.Press .addRecipeX(T, 16, 64, ST.array(ST.make(MD.AE, "item.ItemMultiMaterial", 1, 18), OM.dust(MT.Redstone), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 20)), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 22));
8181

82-
RM.Autoclave .addRecipe2(T, 0, 1500, ST.nbt(ST.make(MD.AE, "item.ItemCrystalSeed", 1, 0), null), ST.tag(2), FL.Steam.make(48000), FL.DistW.make(225), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 10));
83-
RM.Autoclave .addRecipe2(T, 0, 1500, ST.nbt(ST.make(MD.AE, "item.ItemCrystalSeed", 1, 600), null), ST.tag(2), FL.Steam.make(48000), FL.DistW.make(225), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 11));
84-
RM.Autoclave .addRecipe2(T, 0, 1500, ST.nbt(ST.make(MD.AE, "item.ItemCrystalSeed", 1, 1200), null), ST.tag(2), FL.Steam.make(48000), FL.DistW.make(225), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 12));
82+
RM.Autoclave .addRecipe2(T, 0, 1500, ST.nbt(ST.make(MD.AE, "item.ItemCrystalSeed", 1, 0), null), ST.tag(2), FL.Steam.make(48000), FL.DistW.make(225), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 10)).setNoNBTChecks();
83+
RM.Autoclave .addRecipe2(T, 0, 1500, ST.nbt(ST.make(MD.AE, "item.ItemCrystalSeed", 1, 600), null), ST.tag(2), FL.Steam.make(48000), FL.DistW.make(225), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 11)).setNoNBTChecks();
84+
RM.Autoclave .addRecipe2(T, 0, 1500, ST.nbt(ST.make(MD.AE, "item.ItemCrystalSeed", 1, 1200), null), ST.tag(2), FL.Steam.make(48000), FL.DistW.make(225), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 12)).setNoNBTChecks();
8585

8686
RM.Compressor .addRecipe1(T, 16, 16, OP.gem.mat(MT.CertusQuartz , 4), ST.make(MD.AE, "tile.BlockQuartz", 1, 0));
8787
RM.Compressor .addRecipe1(T, 16, 16, ST.make(MD.AE, "item.ItemMultiMaterial", 8, 10), ST.make(MD.AE, "tile.BlockQuartz", 1, 0));

0 commit comments

Comments
 (0)