Merge branch 'master' into compressor_size

GTNewHorizons · Oct 6, 2024 · 5af0973 · 5af0973
2 parents c5ecd57 + 734c439
commit 5af0973
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java
@@ -38,6 +38,7 @@ public class Avaritia {
     public static CommonProxy proxy;
 
     public static final boolean isHodgepodgeLoaded = Loader.isModLoaded("hodgepodge");
+    public static final boolean isDreamCraftLoaded = Loader.isModLoaded("dreamcraft");
 
     public static CreativeTabs tab = new CreativeTabs("avaritia") {
 

diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java
@@ -10,6 +10,7 @@
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
+import fox.spiteful.avaritia.Avaritia;
 import fox.spiteful.avaritia.Config;
 import fox.spiteful.avaritia.Lumberjack;
 import fox.spiteful.avaritia.blocks.LudicrousBlocks;
@@ -239,7 +240,7 @@ public static void compatify() {
                 te = false;
             }
         }
-        if (!Loader.isModLoaded("dreamcraft")) {
+        if (!Avaritia.isDreamCraftLoaded) {
             if (Loader.isModLoaded("witchery") && Config.witch) {
                 try {
                     Block egg = getBlock("witchery", "infinityegg");

diff --git a/src/main/java/fox/spiteful/avaritia/compat/ticon/Tonkers.java b/src/main/java/fox/spiteful/avaritia/compat/ticon/Tonkers.java
@@ -6,7 +6,7 @@
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
+import fox.spiteful.avaritia.Avaritia;
 import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
 import fox.spiteful.avaritia.items.LudicrousItems;
 import tconstruct.library.TConstructRegistry;
@@ -95,7 +95,7 @@ public void modify(ItemStack[] recipe, ItemStack input) {
                     }
                 });
 
-        if (Loader.isModLoaded("dreamcraft")) return;
+        if (Avaritia.isDreamCraftLoaded) return;
 
         // recipes
         ItemStack ingot = new ItemStack(LudicrousItems.resource, 1, 6);

diff --git a/src/main/java/fox/spiteful/avaritia/crafting/CompressorManager.java b/src/main/java/fox/spiteful/avaritia/crafting/CompressorManager.java
@@ -4,19 +4,24 @@
 
 import net.minecraft.item.ItemStack;
 
+import fox.spiteful.avaritia.Avaritia;
+
 public class CompressorManager {
 
-    private static ArrayList<CompressorRecipe> recipes = new ArrayList<CompressorRecipe>();
+    private static final ArrayList<CompressorRecipe> recipes = new ArrayList<>();
 
     public static void addRecipe(ItemStack output, int amount, ItemStack input) {
+        if (Avaritia.isDreamCraftLoaded) return;
         recipes.add(new CompressorRecipe(output, amount, input));
     }
 
     public static void addOreRecipe(ItemStack output, int amount, String ore) {
+        if (Avaritia.isDreamCraftLoaded) return;
         recipes.add(new CompressOreRecipe(output, amount, ore));
     }
 
     public static ItemStack getOutput(ItemStack input) {
+        if (Avaritia.isDreamCraftLoaded) return null;
         for (CompressorRecipe recipe : recipes) {
             if (recipe.validInput(input)) return recipe.getOutput();
         }
@@ -25,7 +30,7 @@ public static ItemStack getOutput(ItemStack input) {
 
     public static int getCost(ItemStack input) {
         if (input == null) return 0;
-
+        if (Avaritia.isDreamCraftLoaded) return 0;
         for (CompressorRecipe recipe : recipes) {
             if (recipe.validInput(input)) return recipe.getCost();
         }
@@ -34,14 +39,15 @@ public static int getCost(ItemStack input) {
 
     public static int getPrice(ItemStack output) {
         if (output == null) return 0;
-
+        if (Avaritia.isDreamCraftLoaded) return 0;
         for (CompressorRecipe recipe : recipes) {
             if (recipe.getOutput().isItemEqual(output)) return recipe.getCost();
         }
         return 0;
     }
 
     public static String getName(ItemStack input) {
+        if (Avaritia.isDreamCraftLoaded) return null;
         for (CompressorRecipe recipe : recipes) {
             if (recipe.validInput(input)) return recipe.getIngredientName();
         }