black essentia gas from ThE

This commit is contained in:
GlodBlock committed 2022-07-13 20:05:14 +08:00
1 parent f39548d97b
commit 61cdd8c487
5 files changed
+24 -3

No files matched your search

+4
View File
@@ -12,8 +12,12 @@ dependencies {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.41:dev') compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.41:dev')
compileOnly('com.github.GTNewHorizons:StructureLib:1.0.15:dev') compileOnly('com.github.GTNewHorizons:StructureLib:1.0.15:dev')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:dev') {transitive = false}
compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") {transitive = false} compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev') {transitive = false}
runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
} }
@@ -13,6 +13,7 @@ public class Config {
public static boolean noFluidPacket; public static boolean noFluidPacket;
public static boolean fluidIOBus; public static boolean fluidIOBus;
public static boolean removeRecipe; public static boolean removeRecipe;
public static boolean blacklistEssentiaGas;
public static void run() { public static void run() {
loadCategory(); loadCategory();
@@ -21,9 +22,10 @@ public class Config {
private static void loadProperty() { private static void loadProperty() {
fluidCells = Config.getBoolean("Enable Fluid Storage Cell", "Fluid Craft for AE2", true, "Enable this to generate the fluid storage cells. If you are playing with EC2, you can turn it off."); fluidCells = Config.getBoolean("Enable Fluid Storage Cell", "Fluid Craft for AE2", true, "Enable this to generate the fluid storage cells. If you are playing with EC2, you can turn it off.");
noFluidPacket = Config.getBoolean("No Fluid Packet", "Fluid Craft for AE2", false, "Enable this to make normal ME Interface can emit fluid with fluid pattern, like the Fluid Interface."); noFluidPacket = Config.getBoolean("No Fluid Packet", "Fluid Craft for AE2", false, "Enable this to make normal ME Interface can emit fluid with fluid pattern, like the ME Dual Interface.");
fluidIOBus = Config.getBoolean("Enable AE2FC's Fluid I/O Bus", "Fluid Craft for AE2", true, "Enable this to add Fluid Import/Export Bus like EC2's one."); fluidIOBus = Config.getBoolean("Enable AE2FC's Fluid I/O Bus", "Fluid Craft for AE2", true, "Enable this to add Fluid Import/Export Bus like EC2's one.");
removeRecipe = Config.getBoolean("Disable all recipes", "Fluid Craft for AE2", false, "Disable all recipes, for quick tweaker."); removeRecipe = Config.getBoolean("Disable all recipes", "Fluid Craft for AE2", false, "Disable all recipes, for quick tweaker.");
blacklistEssentiaGas = Config.getBoolean("Blacklist Essentia Gas", "Fluid Craft for AE2", true, "Blacklist Essentia Gas from Thaumic Energistics, so they won't be stored in Fluid Storage Cells.");
if (Config.hasChanged()) if (Config.hasChanged())
Config.save(); Config.save();
@@ -23,6 +23,7 @@ import com.glodblock.github.common.storage.CellType;
import com.glodblock.github.common.storage.IFluidCellInventory; import com.glodblock.github.common.storage.IFluidCellInventory;
import com.glodblock.github.common.storage.IFluidCellInventoryHandler; import com.glodblock.github.common.storage.IFluidCellInventoryHandler;
import com.glodblock.github.common.storage.IStorageFluidCell; import com.glodblock.github.common.storage.IStorageFluidCell;
import com.glodblock.github.util.ModAndClassUtil;
import com.glodblock.github.util.NameConst; import com.glodblock.github.util.NameConst;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@@ -157,6 +158,9 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
@Override @Override
public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) { public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
if (Config.blacklistEssentiaGas && ModAndClassUtil.ThE && requestedAddition != null) {
return ModAndClassUtil.essentiaGas.isInstance(requestedAddition.getFluid());
}
return false; return false;
} }
@@ -11,6 +11,8 @@ import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.item.AEFluidStack; import appeng.util.item.AEFluidStack;
import com.glodblock.github.common.Config;
import com.glodblock.github.util.ModAndClassUtil;
import com.glodblock.github.util.Util; import com.glodblock.github.util.Util;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@@ -18,6 +18,7 @@ public final class ModAndClassUtil {
public static boolean EIO = false; public static boolean EIO = false;
public static boolean FTR = false; public static boolean FTR = false;
public static boolean OC = false; public static boolean OC = false;
public static boolean ThE = false;
public static boolean isDoubleButton; public static boolean isDoubleButton;
public static boolean isSaveText; public static boolean isSaveText;
@@ -27,6 +28,8 @@ public final class ModAndClassUtil {
public static boolean isShiftTooltip; public static boolean isShiftTooltip;
public static boolean isBigInterface; public static boolean isBigInterface;
public static Class<?> essentiaGas;
@SuppressWarnings("all") @SuppressWarnings("all")
public static void init() { public static void init() {
@@ -86,6 +89,12 @@ public final class ModAndClassUtil {
isCraftStatus = false; isCraftStatus = false;
} }
try {
essentiaGas = Class.forName("thaumicenergistics.common.fluids.GaseousEssentia");
} catch (ClassNotFoundException e) {
essentiaGas = null;
}
if (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi")) if (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi"))
GT5 = true; GT5 = true;
if (Loader.isModLoaded("gregapi") && Loader.isModLoaded("gregapi_post")) if (Loader.isModLoaded("gregapi") && Loader.isModLoaded("gregapi_post"))
@@ -98,8 +107,8 @@ public final class ModAndClassUtil {
FTR = true; FTR = true;
if (Loader.isModLoaded("OpenComputers")) if (Loader.isModLoaded("OpenComputers"))
OC = true; OC = true;
if (Loader.isModLoaded("thaumicenergistics"))
ThE = true;
} }
} }