diff options
| author | Батьків Нестор-Євген Васильович <mama040508@gmail.com> | 2023-03-19 18:15:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-19 17:15:34 +0100 |
| commit | 44e5f4e5b1a9f42682cd6efedfa72aed58a31c3d (patch) | |
| tree | 8020251ae48a0502ae8e6b39b56fa43848d55eb6 | |
| parent | 260bfdb1f873b4abfa3e80ad89fd3593041c2214 (diff) | |
| download | GT5-Unofficial-44e5f4e5b1a9f42682cd6efedfa72aed58a31c3d.tar.gz GT5-Unofficial-44e5f4e5b1a9f42682cd6efedfa72aed58a31c3d.tar.bz2 GT5-Unofficial-44e5f4e5b1a9f42682cd6efedfa72aed58a31c3d.zip | |
Add Bw glass to Ore factory (#1802)
Make Assine Accept UMV glass
2 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 6f09aa6ede..0b47b93334 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -76,6 +76,7 @@ public class GT_MetaTileEntity_AssemblyLine extends ofChain( ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true), ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 0, true), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0, true), // warded glass ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false))) .addElement( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index 8b7c5cdf99..6fd9ad5851 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -23,7 +23,6 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -87,7 +86,14 @@ public class GT_MetaTileEntity_IntegratedOreFactory "EEEEEE " } })) .addElement('i', ofBlock(GregTech_API.sBlockCasings8, 7)) .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement('g', ofBlockAnyMeta(GameRegistry.findBlock("IC2", "blockAlloyGlass"))) + .addElement( + 'g', + ofChain( + ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 0, true), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0, true), + // warded glass + ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false))) .addElement('x', ofBlock(GregTech_API.sBlockCasings2, 3)) .addElement('p', ofBlock(GregTech_API.sBlockCasings2, 15)).addElement('t', ofFrame(Materials.TungstenSteel)) .addElement( |