diff options
| author | Quetz4l <aizektro@gmail.com> | 2023-05-14 21:27:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-14 20:27:21 +0200 |
| commit | 3a4b5705aba728ed2f344a430331ac4d858a25b9 (patch) | |
| tree | d75c618eb1b6e0008c617d183a487f70c763e137 /src/main/java | |
| parent | af80bdb7f173843c7270347178ebca6e559095f3 (diff) | |
| download | GT5-Unofficial-3a4b5705aba728ed2f344a430331ac4d858a25b9.tar.gz GT5-Unofficial-3a4b5705aba728ed2f344a430331ac4d858a25b9.tar.bz2 GT5-Unofficial-3a4b5705aba728ed2f344a430331ac4d858a25b9.zip | |
any glass for structures (#160)
* bs
* any glass for ExtremeHeatExchanger
* any glass for NeutronActivator
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java | 26 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java | 5 |
2 files changed, 13 insertions, 18 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java index 7c00d598a9..9e30e744c7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java @@ -11,7 +11,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,9 +40,9 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.multitileentity.multiblock.casing.Glasses; import gregtech.api.render.TextureFactory; import gregtech.api.util.*; -import ic2.core.Ic2Items; public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -74,18 +73,15 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas mName, transpose( new String[][] { - { " CCC ", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", - "TTTTT", "TTTTT", " CCC " }, - { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - "GWWWG", "GPPPG", " CCC " }, - { " CFC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - "GWWWG", "GPPPG", " CEC " }, - { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - "GWWWG", "GPPPG", " CCC " }, - { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - "GWWWG", "GPPPG", " CCC " }, - { " C~C ", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", - "BBBBB", "BBBBB", " CCC " }, })) + // spotless:off + { " CCC ", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", " CCC " }, + { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", " CCC " }, + { " CFC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", " CEC " }, + { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", " CCC " }, + { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", " CCC " }, + { " C~C ", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", " CCC " }, + //spotless:on + })) .addElement( 'B', ofChain( @@ -117,7 +113,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas GregTech_API.sBlockCasings4, 0), onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) - .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0)) + .addElement('G', Glasses.chainAllGlasses()) .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) .addElement('W', ofBlock(Loaders.pressureResistantWalls, 0)).build(); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index c3792bd7c8..8bbf7d8030 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; -import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTieredMixed; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; @@ -48,6 +47,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.multitileentity.multiblock.casing.Glasses; import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; import gregtech.api.util.*; @@ -224,8 +224,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 6)).addElement('F', ofFrame(Materials.Steel)) - .addElement('G', ofGlassTieredMixed((byte) 4, (byte) 127, 3)) - .addElement( + .addElement('G', Glasses.chainAllGlasses()).addElement( 'P', ofBlock(Loaders.speedingPipe, 0)) .addElement( |