From 76046b8b20bfae96c2c5fa7c30fc5be40f8fa370 Mon Sep 17 00:00:00 2001 From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Date: Mon, 6 Feb 2023 04:20:12 +0800 Subject: Allow input hatch on inner ring of compact fusion (#134) * allow input hatch at inner ring * c --- .../blocks/tileEntity/LargeFusionComputer1.java | 9 ++- .../blocks/tileEntity/LargeFusionComputer2.java | 9 ++- .../blocks/tileEntity/LargeFusionComputer3.java | 9 ++- .../blocks/tileEntity/LargeFusionComputer4.java | 9 ++- .../blocks/tileEntity/LargeFusionComputer5.java | 9 ++- .../tileEntity/base/LargeFusionComputer.java | 65 ++++++++++------------ .../tileEntity/base/LargeFusionComputerPP.java | 63 ++++++++++----------- 7 files changed, 94 insertions(+), 79 deletions(-) (limited to 'src/main/java/goodgenerator/blocks') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java index 71f6600c15..a97d75aacb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java @@ -20,6 +20,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Utility; public class LargeFusionComputer1 extends LargeFusionComputer { @@ -56,8 +57,12 @@ public class LargeFusionComputer1 extends LargeFusionComputer { .addCasingInfo("LuV Machine Casing", 1664).addCasingInfo("Ameliorated Superconduct Coil", 560) .addCasingInfo("Naquadah Alloy Frame Boxes", 128) .addCasingInfo("Rhodium-Plated Palladium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be LuV or better") + .addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 1", 1) + .addStructureInfo( + "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + + EnumChatFormatting.GRAY + + " or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java index e4d3553910..4f8841c68b 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java @@ -20,6 +20,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Utility; public class LargeFusionComputer2 extends LargeFusionComputer { @@ -57,8 +58,12 @@ public class LargeFusionComputer2 extends LargeFusionComputer { .addCasingInfo("Fusion Machine Casing", 1664).addCasingInfo("Compact Fusion Coil", 560) .addCasingInfo("Duranium Frame Box", 128) .addCasingInfo("Iridium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be ZPM or better") + .addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 1", 1) + .addStructureInfo( + "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + + EnumChatFormatting.GRAY + + " or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java index ff85da2303..0a4c99b958 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java @@ -20,6 +20,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Utility; public class LargeFusionComputer3 extends LargeFusionComputer { @@ -58,8 +59,12 @@ public class LargeFusionComputer3 extends LargeFusionComputer { .addCasingInfo("Fusion Machine Casing MK II", 1664).addCasingInfo("Advanced Compact Fusion Coil", 560) .addCasingInfo("Neutronium Frame Box", 128) .addCasingInfo("Osmium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be UV or better") + .addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 1", 1) + .addStructureInfo( + "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + + EnumChatFormatting.GRAY + + " or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java index ca38e45940..033c71ed95 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java @@ -26,6 +26,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -67,8 +68,12 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { .addCasingInfo("Compact Fusion Coil MK-II Prototype", 560) .addCasingInfo("Infinity Catalyst Frame Box", 128) .addCasingInfo("Neutronium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be UHV or better") + .addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 1", 1) + .addStructureInfo( + "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + + EnumChatFormatting.GRAY + + " or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index c27270d13b..a70fa66b78 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -24,6 +24,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -61,8 +62,12 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { .addCasingInfo("Fusion Machine Casing MK IV", 1664) .addCasingInfo("Compact Fusion Coil MK-II Finaltype", 560).addCasingInfo("Infinity Frame Box", 128) .addCasingInfo("Cosmic Neutronium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be UEV or better") + .addEnergyHatch("1-32, Hint block with dot 2", 2).addInputHatch("1-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 1", 1) + .addStructureInfo( + "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + + EnumChatFormatting.GRAY + + " or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index cbefc01a45..dcf78cebcc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -35,6 +35,7 @@ import gregtech.api.enums.Textures; 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.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; @@ -66,23 +67,16 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti 'I', lazy( x -> GT_HatchElementBuilder.builder() - .atLeast(GT_HatchElement.InputHatch).adder(LargeFusionComputer::addInjector) - .casingIndex(x.textureIndex()).dot(1) + .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.OutputHatch) + .adder(LargeFusionComputer::addFluidIO).casingIndex(x.textureIndex()).dot(1) .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) - .addElement( - 'O', - lazy( - x -> GT_HatchElementBuilder.builder() - .atLeast(GT_HatchElement.OutputHatch) - .adder(LargeFusionComputer::addExtractor).casingIndex(x.textureIndex()) - .dot(2).buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) .addElement( 'E', lazy( x -> GT_HatchElementBuilder.builder() .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) .adder(LargeFusionComputer::addEnergyInjector).casingIndex(x.textureIndex()) - .dot(3).buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) + .dot(2).buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))).build(); } }; @@ -141,7 +135,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { this.eEnergyMulti.clear(); - if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() > 1 + if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && !mInputHatches.isEmpty() && !mOutputHatches.isEmpty() && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { fixAllIssue(); @@ -504,26 +498,27 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti return false; } - private boolean addInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { - IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)) return false; - GT_MetaTileEntity_Hatch_Input tHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; - if (tHatch.mTier < hatchTier()) return false; - tHatch.updateTexture(aBaseCasingIndex); - tHatch.mRecipeMap = getRecipeMap(); - return mInputHatches.add(tHatch); - } - - private boolean addExtractor(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { - if (aBaseMetaTileEntity == null) return false; + private boolean addFluidIO(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)) return false; - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; - if (tHatch.mTier < hatchTier()) return false; - tHatch.updateTexture(aBaseCasingIndex); - return mOutputHatches.add(tHatch); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { + GT_MetaTileEntity_Hatch tHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + if (tHatch.mTier < hatchTier()) return false; + } else { + return false; + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + GT_MetaTileEntity_Hatch_Input tInput = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + tInput.updateTexture(aBaseCasingIndex); + tInput.mRecipeMap = getRecipeMap(); + return mInputHatches.add(tInput); + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { + GT_MetaTileEntity_Hatch_Output tOutput = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + tOutput.updateTexture(aBaseCasingIndex); + return mOutputHatches.add(tOutput); + } + return false; } @Override @@ -694,10 +689,10 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti " CCCCCHHHHHHHHHCCCCC ", " CCCCC CCCCC ", " CC CC ", " FCCCCCF ", }; - public static final String[] L3 = { " FCOBOCF ", + public static final String[] L3 = { " FCIBICF ", " CC CC ", " CCCHHHHHHHHHCCC ", " CCHHHHHHHHHHHHHHHCC ", " CCHHHHHHHHHHHHHHHHHHHCC ", - " CHHHHHHHCC CCHHHHHHHC ", " CHHHHHCCC FCOBOCF CCCHHHHHC ", + " CHHHHHHHCC CCHHHHHHHC ", " CHHHHHCCC FCIBICF CCCHHHHHC ", " CHHHHCC CCHHHHC ", " CHHHCC CCHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", @@ -705,8 +700,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", "FCHHHCF FCHHHCF", - "C HHH C C HHH C", "O HHH O O HHH O", - "B HHH B B HHH B", "O HHH O O HHH O", + "C HHH C C HHH C", "I HHH I I HHH I", + "B HHH B B HHH B", "I HHH I I HHH I", "C HHH C C HHH C", "FCHHHCF FCHHHCF", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", @@ -714,8 +709,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHCC CCHHHC ", - " CHHHHCC CCHHHHC ", " CHHHHHCCC FCO~OCF CCCHHHHHC ", + " CHHHHCC CCHHHHC ", " CHHHHHCCC FCI~ICF CCCHHHHHC ", " CHHHHHHHCC CCHHHHHHHC ", " CCHHHHHHHHHHHHHHHHHHHCC ", " CCHHHHHHHHHHHHHHHCC ", " CCCHHHHHHHHHCCC ", - " CC CC ", " FCOBOCF ", }; + " CC CC ", " FCIBICF ", }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java index 36b2f48b5f..47491ea4f4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -35,6 +35,7 @@ import gregtech.api.enums.Textures; 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.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; @@ -67,22 +68,15 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul lazy( x -> GT_HatchElementBuilder.builder() .atLeast(GT_HatchElement.InputHatch) - .adder(LargeFusionComputerPP::addInjector).casingIndex(x.textureIndex()) + .adder(LargeFusionComputerPP::addFluidIO).casingIndex(x.textureIndex()) .dot(1).buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) - .addElement( - 'O', - lazy( - x -> GT_HatchElementBuilder.builder() - .atLeast(GT_HatchElement.OutputHatch) - .adder(LargeFusionComputerPP::addExtractor).casingIndex(x.textureIndex()) - .dot(2).buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) .addElement( 'E', lazy( x -> GT_HatchElementBuilder.builder() .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) .adder(LargeFusionComputerPP::addEnergyInjector) - .casingIndex(x.textureIndex()).dot(3) + .casingIndex(x.textureIndex()).dot(2) .buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))).build(); } @@ -140,7 +134,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { this.eEnergyMulti.clear(); - if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() > 1 + if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && !mInputHatches.isEmpty() && !mOutputHatches.isEmpty() && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { fixAllIssue(); @@ -488,26 +482,27 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul return false; } - private boolean addInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { - IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)) return false; - GT_MetaTileEntity_Hatch_Input tHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; - if (tHatch.mTier < hatchTier()) return false; - tHatch.updateTexture(aBaseCasingIndex); - tHatch.mRecipeMap = getRecipeMap(); - return mInputHatches.add(tHatch); - } - - private boolean addExtractor(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { - if (aBaseMetaTileEntity == null) return false; + private boolean addFluidIO(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)) return false; - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; - if (tHatch.mTier < hatchTier()) return false; - tHatch.updateTexture(aBaseCasingIndex); - return mOutputHatches.add(tHatch); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { + GT_MetaTileEntity_Hatch tHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + if (tHatch.mTier < hatchTier()) return false; + } else { + return false; + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + GT_MetaTileEntity_Hatch_Input tInput = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + tInput.updateTexture(aBaseCasingIndex); + tInput.mRecipeMap = getRecipeMap(); + return mInputHatches.add(tInput); + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { + GT_MetaTileEntity_Hatch_Output tOutput = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + tOutput.updateTexture(aBaseCasingIndex); + return mOutputHatches.add(tOutput); + } + return false; } @Override @@ -677,10 +672,10 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul " CCCCCHHHHHHHHHCCCCC ", " CCCCC CCCCC ", " CC CC ", " FCCCCCF ", }; - public static final String[] L3 = { " FCOBOCF ", + public static final String[] L3 = { " FCIBICF ", " CC CC ", " CCCHHHHHHHHHCCC ", " CCHHHHHHHHHHHHHHHCC ", " CCHHHHHHHHHHHHHHHHHHHCC ", - " CHHHHHHHCC CCHHHHHHHC ", " CHHHHHCCC FCOBOCF CCCHHHHHC ", + " CHHHHHHHCC CCHHHHHHHC ", " CHHHHHCCC FCIBICF CCCHHHHHC ", " CHHHHCC CCHHHHC ", " CHHHCC CCHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", @@ -688,8 +683,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", "FCHHHCF FCHHHCF", - "C HHH C C HHH C", "O HHH O O HHH O", - "B HHH B B HHH B", "O HHH O O HHH O", + "C HHH C C HHH C", "I HHH I I HHH I", + "B HHH B B HHH B", "I HHH I I HHH I", "C HHH C C HHH C", "FCHHHCF FCHHHCF", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", @@ -697,8 +692,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHC CHHHC ", " CHHHCC CCHHHC ", - " CHHHHCC CCHHHHC ", " CHHHHHCCC FCO~OCF CCCHHHHHC ", + " CHHHHCC CCHHHHC ", " CHHHHHCCC FCI~ICF CCCHHHHHC ", " CHHHHHHHCC CCHHHHHHHC ", " CCHHHHHHHHHHHHHHHHHHHCC ", " CCHHHHHHHHHHHHHHHCC ", " CCCHHHHHHHHHCCC ", - " CC CC ", " FCOBOCF ", }; + " CC CC ", " FCIBICF ", }; } -- cgit