diff options
| author | Lyfts <127234178+Lyfts@users.noreply.github.com> | 2024-02-10 09:27:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 09:27:09 +0100 |
| commit | 45128e7f18477fa1a21db8022a227389fe815ba7 (patch) | |
| tree | 247eb646413806f397ee89fb7f2f7b59afb36483 /src/main/java | |
| parent | 09d0d0573d1820c115476ef477fc922619b903ae (diff) | |
| download | GT5-Unofficial-45128e7f18477fa1a21db8022a227389fe815ba7.tar.gz GT5-Unofficial-45128e7f18477fa1a21db8022a227389fe815ba7.tar.bz2 GT5-Unofficial-45128e7f18477fa1a21db8022a227389fe815ba7.zip | |
Compact fusion structure fixes (#236)
* update bs+deps+address deprecation
* compact fusion autobuild fixes
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 12 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/main/GoodGenerator.java | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index 93faf16968..af41493ba3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -2,6 +2,7 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.filterByMTETier; import static gregtech.api.util.GT_StructureUtility.ofFrame; import static gregtech.api.util.GT_Utility.filterValidMTEs; @@ -85,17 +86,20 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti lazy( x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() .atLeast( - GT_HatchElement.InputHatch, - GT_HatchElement.OutputHatch, - GT_HatchElement.InputBus) + GT_HatchElement.InputHatch.or(GT_HatchElement.InputBus), + GT_HatchElement.OutputHatch) .adder(LargeFusionComputer::addFluidIO).casingIndex(x.textureIndex()).dot(1) + .hatchItemFilterAnd( + x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) .addElement( 'E', lazy( x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() - .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) + .anyOf(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) .adder(LargeFusionComputer::addEnergyInjector).casingIndex(x.textureIndex()) + .hatchItemFilterAnd( + x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) .dot(2).buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))).build(); } diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java index 8705b58669..fcc5ff52d9 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -13,6 +13,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import goodgenerator.Tags; import goodgenerator.common.CommonProxy; import goodgenerator.crossmod.thaumcraft.Research; import goodgenerator.items.MyMaterial; @@ -32,9 +33,9 @@ import goodgenerator.tabs.MyTabs; + "after:dreamcraft;") public final class GoodGenerator { - public static final String MOD_ID = "GRADLETOKEN_MODID"; - public static final String MOD_NAME = "GRADLETOKEN_MODNAME"; - public static final String VERSION = "GRADLETOKEN_VERSION"; + public static final String MOD_ID = "GoodGenerator"; + public static final String MOD_NAME = "Good Generator"; + public static final String VERSION = Tags.VERSION; public static final CreativeTabs GG = new MyTabs("Good Generator"); |