diff options
| author | repo-alt <wvk17@yandex.ru> | 2022-01-15 21:21:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-15 19:21:51 +0100 |
| commit | ed06cb6db107184ee0d3942d0f201958c2d24070 (patch) | |
| tree | 6ea5a86b9ec2c331ca44fd8b3e623809812a463e /src/main/java | |
| parent | df3c2cd2aa61084117486a92bcb824cc8e264ec3 (diff) | |
| download | GT5-Unofficial-ed06cb6db107184ee0d3942d0f201958c2d24070.tar.gz GT5-Unofficial-ed06cb6db107184ee0d3942d0f201958c2d24070.tar.bz2 GT5-Unofficial-ed06cb6db107184ee0d3942d0f201958c2d24070.zip | |
Feature/ae dependency optional (#874)
* Allow toolbox usage for maintenance w/o opening GUI
(Also resolves https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9044)
* make AE dependency optional again
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index 718529894b..bdd0174709 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -1,6 +1,8 @@ package gregtech.common.covers; import com.google.common.io.ByteArrayDataInput; + +import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.gui.GT_GUICover; import gregtech.api.gui.widgets.GT_GuiFakeItemButton; @@ -78,7 +80,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. ItemStack[] inv = dc.getStoredItemData(); if (inv != null && inv.length > 1 && inv[1] != null) tUsed = inv[1].stackSize; - } else if (mte instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) { + } else if (GregTech_API.mAE2 && mte instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) { if (((GT_MetaTileEntity_Hatch_OutputBus_ME) mte).isLastOutputFailed()) { tMax = 64; tUsed = 64; diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index a1ddd35e45..fd5fadda71 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -266,7 +266,8 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Long_Distance_Pipeline_Fluid.set(new GT_MetaTileEntity_LongDistancePipelineFluid(2700, "long.distance.pipeline.fluid", "Long Distance Fluid Pipeline", 1).getStackForm(1L)); ItemList.Long_Distance_Pipeline_Item.set(new GT_MetaTileEntity_LongDistancePipelineItem(2701, "long.distance.pipeline.item", "Long Distance Item Pipeline", 1).getStackForm(1L)); - ItemList.Hatch_Output_Bus_ME.set(new GT_MetaTileEntity_Hatch_OutputBus_ME(2710, "hatch.output_bus.me", "Output Bus (ME)").getStackForm(1L)); + if (GregTech_API.mAE2) + ItemList.Hatch_Output_Bus_ME.set(new GT_MetaTileEntity_Hatch_OutputBus_ME(2710, "hatch.output_bus.me", "Output Bus (ME)").getStackForm(1L)); ItemList.Hatch_Input_Bus_ULV.set(new GT_MetaTileEntity_Hatch_InputBus(70, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0).getStackForm(1L)); ItemList.Hatch_Input_Bus_LV.set(new GT_MetaTileEntity_Hatch_InputBus(71, "hatch.input_bus.tier.01", "Input Bus (LV)", 1).getStackForm(1L)); |