fix checks for gt

GTNewHorizons · Jun 21, 2024 · b7c233e · b7c233e
1 parent dd0c9ae
commit b7c233e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/tb/common/block/BlockRainbowCactus.java b/src/main/java/tb/common/block/BlockRainbowCactus.java
@@ -65,7 +65,7 @@ public void addDyeDropsToOutput(Random rand, ArrayList<ItemStack> ret) {
     public static ItemStack[] allowedDyes;
 
     public static void loadColors() {
-        if (Loader.isModLoaded("gregtech")) {
+        if (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi")) {
             // The fact all dyes have the same probability of dropping when gregtech is installed is intended.
             allowedDyes = new ItemStack[] { ItemList.Color_00.get(1), ItemList.Color_01.get(1),
                 ItemList.Color_02.get(1), ItemList.Color_03.get(1), ItemList.Color_04.get(1), ItemList.Color_05.get(1),

diff --git a/src/main/java/tb/init/TBThaumonomicon.java b/src/main/java/tb/init/TBThaumonomicon.java
@@ -2858,7 +2858,7 @@ public static void setup() {
                     .setConcealed()
                     .setPages(
                         new ResearchPage(
-                            Loader.isModLoaded("gregtech") ? "tb.rec.rainCacti.page.0.gt" : "tb.rec.rainCacti.page.0"),
+                                (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi")) ? "tb.rec.rainCacti.page.0.gt" : "tb.rec.rainCacti.page.0"),
                         new ResearchPage(rainbowCactiRec))
                     .registerResearchItem();