diff options
author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2023-04-21 19:09:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-21 19:09:47 +0200 |
commit | 285a75535d07f2037967b1208a5840fb81719514 (patch) | |
tree | 4e5fee76309ae7f184479306e452b8ce82491bca /src/main/java/gregtech/common/tileentities/machines | |
parent | 28edf90a21fb9e281ce06c8d77ab4b05a818eaf8 (diff) | |
download | GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.tar.gz GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.tar.bz2 GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.zip |
Stellar catalyst + catalyst fixes + new materials class (#1893)
* add catalyst
* pu plasma recipe
* increase plasma mixer input slots
* noOptimize + mixer recipe + voltage fix
* noOptimize + PLE recipe
* TPM recipe
* spotlessApply (#1894)
Co-authored-by: GitHub GTNH Actions <>
* add two more plasma recipes
* replace neptunium & fermium plasma
* spotless
* fix stellar plasma amount
* new materials class
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java index 9d8912f0c5..61ce017d5a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java @@ -33,6 +33,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -306,7 +307,8 @@ public class GT_MetaTileEntity_NanoForge extends mSpecialTier = 2; } - if (aStack.isItemEqual(Materials.TranscendentMetal.getNanite(1)) && checkPiece(STRUCTURE_PIECE_MAIN, 4, 37, 1) + if (aStack.isItemEqual(MaterialsUEVplus.TranscendentMetal.getNanite(1)) + && checkPiece(STRUCTURE_PIECE_MAIN, 4, 37, 1) && checkPiece(STRUCTURE_PIECE_TIER2, -7, 14, 4) && checkPiece(STRUCTURE_PIECE_TIER3, 14, 26, 4)) { mSpecialTier = 3; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java index 5f32ec190d..30368a12f0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java @@ -29,7 +29,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; -import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -51,8 +51,9 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul private static final double maximum_discount = 0.5d; // Valid fuels which the discount will get applied to. - private static final FluidStack[] valid_fuels = { Materials.ExcitedDTEC.getFluid(1L), - Materials.ExcitedDTRC.getFluid(1L), Materials.ExcitedDTPC.getFluid(1L), Materials.ExcitedDTCC.getFluid(1L), }; + private static final FluidStack[] valid_fuels = { MaterialsUEVplus.ExcitedDTEC.getFluid(1L), + MaterialsUEVplus.ExcitedDTRC.getFluid(1L), MaterialsUEVplus.ExcitedDTPC.getFluid(1L), + MaterialsUEVplus.ExcitedDTCC.getFluid(1L), MaterialsUEVplus.ExcitedDTSC.getFluid(1L) }; // Saves recomputing this every recipe check for overclocking. private static final double log4 = log(4); |