fixed conflict between exquisite and regular gem recipe in implosion …

…compressor
GT-Reimagined · Nov 24, 2024 · bbf1a7e · bbf1a7e
1 parent 711b0c8
commit bbf1a7e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/common/src/main/java/org/gtreimagined/gt5r/loader/multi/ImplosionCompressorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/ImplosionCompressorLoader.java
@@ -3,6 +3,7 @@
 import muramasa.antimatter.recipe.ingredient.RecipeIngredient;
 import org.gtreimagined.gt5r.data.GT5RMaterialTags;
 import net.minecraft.world.item.Items;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterials.Diamond;
@@ -13,9 +14,11 @@ public class ImplosionCompressorLoader {
     public static void init(){
         GEM.all().stream().filter(m -> !m.has(GT5RMaterialTags.CRYSTALLIZE) && !m.has(GT5RMaterialTags.NON_GEMS) && m.has(DUST)).forEach(m -> {
             int tnt = m == RedGarnet || m == YellowGarnet || m == Ruby ? 4 : m == Diamond ? 8: 6;
-            IMPLOSION_COMPRESSOR.RB().ii(DUST.getMaterialIngredient(m, 4), RecipeIngredient.of(Items.TNT, tnt * 2)).io(GEM.get(m, 3), DUST_TINY.get(DarkAsh, tnt * 2)).add(m.getId() + "_from_tnt", 20, 30);
-            if (m.has(GEM_EXQUISITE)) {
-                IMPLOSION_COMPRESSOR.RB().ii(DUST.getMaterialIngredient(m, 6), RecipeIngredient.of(Items.TNT, tnt * 3)).io(GEM_EXQUISITE.get(m, 1), DUST_TINY.get(DarkAsh, tnt * 2)).add("exquisite_" + m.getId() + "_from_tnt", 30, 30);
+            if (m.has(GEM_EXQUISITE)){
+                IMPLOSION_COMPRESSOR.RB().ii(DUST.getMaterialIngredient(m, 4), RecipeIngredient.of(Items.TNT, tnt * 2), GTCoreItems.SELECTOR_TAG_INGREDIENTS.get(4)).io(GEM.get(m, 3), DUST_TINY.get(DarkAsh, tnt * 2)).add(m.getId() + "_from_tnt", 20, 30);
+                IMPLOSION_COMPRESSOR.RB().ii(DUST.getMaterialIngredient(m, 6), RecipeIngredient.of(Items.TNT, tnt * 3), GTCoreItems.SELECTOR_TAG_INGREDIENTS.get(6)).io(GEM_EXQUISITE.get(m, 1), DUST_TINY.get(DarkAsh, tnt * 2)).add("exquisite_" + m.getId() + "_from_tnt", 30, 30);
+            } else {
+                IMPLOSION_COMPRESSOR.RB().ii(DUST.getMaterialIngredient(m, 4), RecipeIngredient.of(Items.TNT, tnt * 2)).io(GEM.get(m, 3), DUST_TINY.get(DarkAsh, tnt * 2)).add(m.getId() + "_from_tnt", 20, 30);
             }
         });
     }