diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2024-05-25 14:05:54 +0100 |
|---|---|---|
| committer | Raven Szewczyk <git@eigenraven.me> | 2024-05-25 14:05:54 +0100 |
| commit | 84481c22d7d4e0834de97a150d257ce6e85ad690 (patch) | |
| tree | b988e796d924e443195c370cd9a8d70636d8104d /src/main/java/goodgenerator/blocks/tileEntity | |
| parent | 38c0e7b45323f37cf84e54dcaef578e7faf1d473 (diff) | |
| download | GT5-Unofficial-84481c22d7d4e0834de97a150d257ce6e85ad690.tar.gz GT5-Unofficial-84481c22d7d4e0834de97a150d257ce6e85ad690.tar.bz2 GT5-Unofficial-84481c22d7d4e0834de97a150d257ce6e85ad690.zip | |
Update spotless to the GT5u version
Diffstat (limited to 'src/main/java/goodgenerator/blocks/tileEntity')
27 files changed, 2069 insertions, 1685 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java index 152ceb7839..618477d09c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java @@ -44,129 +44,149 @@ import gregtech.api.util.GT_StructureUtility; import gregtech.api.util.GT_Utility; public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<ComponentAssemblyLine> - implements ISurvivalConstructable { + implements ISurvivalConstructable { private int casingTier; protected static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<ComponentAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition - .<ComponentAssemblyLine>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - new String[][] { - { " ", " III ", " HHI~IHH ", "HH III HH", "H H", "H H", "H JJJ H", - "H JJJ H", "H N N H", "HHHHHHHHH" }, - { " ", " ELHHHLE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", - "AG HHH GA", "AG GA", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", - "HG HHH GH", "HG GH", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", - "AG HHH GA", "AG GA", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", - "HG HHH GH", "HG GH", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", - "AG HHH GA", "AG GA", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", - "HG HHH GH", "HG GH", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", - "AG HHH GA", "AG GA", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A n n A", "MHHHHHHHM" }, - { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " ", " ELHHHLE ", "E E", "H H", "A A", "A A", "A A", - "A HHH A", "A A", "MHHHHHHHM" }, - { " ", " ", " HHHHHHH ", "HH HH", "H H", "H H", "H H", - "H H", "H KKK H", "HHHHHHHHH" } }) - .addElement( - 'A', - ofChain( - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 5), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 13), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 14), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 15), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0))) - .addElement('H', ofBlock(GregTech_API.sBlockCasings8, 7)) - .addElement('C', ofBlock(GregTech_API.sBlockCasings2, 5)) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 9)) - .addElement('G', ofBlock(GregTech_API.sBlockCasings9, 0)) - .addElement('E', ofBlock(GregTech_API.sBlockCasings9, 1)) - .addElement('F', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'B', - ofBlocksTiered( - (block, meta) -> block == Loaders.componentAssemblylineCasing ? meta : -1, - IntStream.range(0, 14).mapToObj(i -> Pair.of(Loaders.componentAssemblylineCasing, i)) - .collect(Collectors.toList()), - -2, - (t, meta) -> t.casingTier = meta, - t -> t.casingTier)) - .addElement( - 'J', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(InputBus).dot(1) - .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'N', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(InputBus).dot(1) - .casingIndex(183).buildAndChain(GT_StructureUtility.ofFrame(Materials.TungstenSteel))) - .addElement( - 'K', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(OutputBus).dot(2) - .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'L', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(Energy, ExoticEnergy) - .dot(3).casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'I', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(Maintenance).dot(4) - .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'M', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(InputHatch).dot(5) - .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement('n', GT_StructureUtility.ofFrame(Materials.TungstenSteel)).build(); + .<ComponentAssemblyLine>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + new String[][] { + { " ", " III ", " HHI~IHH ", "HH III HH", "H H", "H H", "H JJJ H", + "H JJJ H", "H N N H", "HHHHHHHHH" }, + { " ", " ELHHHLE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", + "HG HHH GH", "HG GH", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", + "HG HHH GH", "HG GH", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", + "HG HHH GH", "HG GH", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A n n A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " ", " ELHHHLE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " ", " ", " HHHHHHH ", "HH HH", "H H", "H H", "H H", + "H H", "H KKK H", "HHHHHHHHH" } }) + .addElement( + 'A', + ofChain( + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 5), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 13), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 14), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 15), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0))) + .addElement('H', ofBlock(GregTech_API.sBlockCasings8, 7)) + .addElement('C', ofBlock(GregTech_API.sBlockCasings2, 5)) + .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 9)) + .addElement('G', ofBlock(GregTech_API.sBlockCasings9, 0)) + .addElement('E', ofBlock(GregTech_API.sBlockCasings9, 1)) + .addElement('F', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement( + 'B', + ofBlocksTiered( + (block, meta) -> block == Loaders.componentAssemblylineCasing ? meta : -1, + IntStream.range(0, 14) + .mapToObj(i -> Pair.of(Loaders.componentAssemblylineCasing, i)) + .collect(Collectors.toList()), + -2, + (t, meta) -> t.casingTier = meta, + t -> t.casingTier)) + .addElement( + 'J', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + .atLeast(InputBus) + .dot(1) + .casingIndex(183) + .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'N', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + .atLeast(InputBus) + .dot(1) + .casingIndex(183) + .buildAndChain(GT_StructureUtility.ofFrame(Materials.TungstenSteel))) + .addElement( + 'K', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + .atLeast(OutputBus) + .dot(2) + .casingIndex(183) + .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'L', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + .atLeast(Energy, ExoticEnergy) + .dot(3) + .casingIndex(183) + .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'I', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + .atLeast(Maintenance) + .dot(4) + .casingIndex(183) + .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'M', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + .atLeast(InputHatch) + .dot(5) + .casingIndex(183) + .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement('n', GT_StructureUtility.ofFrame(Materials.TungstenSteel)) + .build(); public ComponentAssemblyLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -190,36 +210,41 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("High-Capacity Component Assembler") - .addInfo("Controller block for the Component Assembly Line.") - .addInfo("Assembles basic components (motors, pumps, etc.) in large batches.") - .addInfo( - "The " + EnumChatFormatting.BOLD - + EnumChatFormatting.YELLOW - + "Component Assembly Line Casing " - + EnumChatFormatting.RESET - + EnumChatFormatting.GRAY - + "limits the recipes the machine can perform. See the NEI pages for details.") - .addInfo( - "Supports " + EnumChatFormatting.BLUE - + "Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " laser and multi-amp hatches!") - .addInfo("Supports overclocking beyond MAX!") - .addInfo(EnumChatFormatting.ITALIC + "Much more efficient than other competing brands!") - .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() - .beginStructureBlock(9, 10, 33, false) - .addStructureInfo("This structure is too complex! See schematic for details.") - .addOtherStructurePart("Borosilicate Glass", "Can be UV tier or higher") - .addInputBus("Start of conveyor belt", 1).addOutputBus("End of conveyor belt", 2) - .addEnergyHatch("Second-top layer", 3).addMaintenanceHatch("Around the controller", 4) - .addInputHatch("Bottom left and right corners", 5).toolTipFinisher( - EnumChatFormatting.AQUA + "MadMan310" - + EnumChatFormatting.GRAY - + " via " - + EnumChatFormatting.GREEN - + "Good Generator"); + .addInfo("Controller block for the Component Assembly Line.") + .addInfo("Assembles basic components (motors, pumps, etc.) in large batches.") + .addInfo( + "The " + EnumChatFormatting.BOLD + + EnumChatFormatting.YELLOW + + "Component Assembly Line Casing " + + EnumChatFormatting.RESET + + EnumChatFormatting.GRAY + + "limits the recipes the machine can perform. See the NEI pages for details.") + .addInfo( + "Supports " + EnumChatFormatting.BLUE + + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " laser and multi-amp hatches!") + .addInfo("Supports overclocking beyond MAX!") + .addInfo(EnumChatFormatting.ITALIC + "Much more efficient than other competing brands!") + .addInfo("The structure is too complex!") + .addInfo(BLUE_PRINT_INFO) + .addSeparator() + .beginStructureBlock(9, 10, 33, false) + .addStructureInfo("This structure is too complex! See schematic for details.") + .addOtherStructurePart("Borosilicate Glass", "Can be UV tier or higher") + .addInputBus("Start of conveyor belt", 1) + .addOutputBus("End of conveyor belt", 2) + .addEnergyHatch("Second-top layer", 3) + .addMaintenanceHatch("Around the controller", 4) + .addInputHatch("Bottom left and right corners", 5) + .toolTipFinisher( + EnumChatFormatting.AQUA + "MadMan310" + + EnumChatFormatting.GRAY + + " via " + + EnumChatFormatting.GREEN + + "Good Generator"); return tt; } @@ -238,21 +263,33 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB String[] ret = new String[origin.length + 1]; System.arraycopy(origin, 0, ret, 0, origin.length); ret[origin.length] = StatCollector.translateToLocal("scanner.info.CASS.tier") - + (casingTier >= 0 ? GT_Values.VN[casingTier + 1] : "None!"); + + (casingTier >= 0 ? GT_Values.VN[casingTier + 1] : "None!"); return ret; } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW).extFacing().glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183), TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183) }; } @@ -300,13 +337,13 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; GT_Utility.sendChatToPlayer( - aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); + aPlayer, + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ, ItemStack aTool) { + float aX, float aY, float aZ, ItemStack aTool) { if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java index 3fd7108603..ae3395ffb9 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java @@ -37,7 +37,7 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { + implements IConstructable, ISurvivalConstructable { protected IStructureDefinition<CoolantTower> multiDefinition = null; private final int CASING_INDEX = 1542; @@ -54,58 +54,45 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { if (multiDefinition == null) { multiDefinition = StructureDefinition.<CoolantTower>builder() - .addShape( - mName, - transpose( - new String[][] { - { " ", " ", " BBB ", " B B ", " B B ", - " B B ", " B B ", " B B ", " BBB ", - " ", " " }, - { " ", " ", " BBB ", " BBBBB ", " BB BB ", - " BB BB ", " BB BB ", " BBBBB ", " BBB ", - " ", " " }, - { " ", " ", " ", " BBB ", " B B ", - " B B ", " B B ", " BBB ", " ", - " ", " " }, - { " ", " ", " ", " BBB ", " B B ", - " B B ", " B B ", " BBB ", " ", - " ", " " }, - { " ", " ", " ", " BBB ", " B B ", - " B B ", " B B ", " BBB ", " ", - " ", " " }, - { " ", " ", " BBB ", " BBBBB ", " BB BB ", - " BB BB ", " BB BB ", " BBBBB ", " BBB ", - " ", " " }, - { " ", " ", " BBB ", " B B ", " B B ", - " B B ", " B B ", " B B ", " BBB ", - " ", " " }, - { " ", " ", " BBB ", " B B ", " B B ", - " B B ", " B B ", " B B ", " BBB ", - " ", " " }, - { " ", " BBB ", " BBBBB ", " BB BB ", " BB BB ", - " BB BB ", " BB BB ", " BB BB ", " BBBBB ", - " BBB ", " " }, - { " ", " BBB ", " B B ", " B B ", " B B ", - " B B ", " B B ", " B B ", " B B ", - " BBB ", " " }, - { " ", " BBBBB ", " BB BB ", " BB BB ", " B B ", - " B B ", " B B ", " BB BB ", " BB BB ", - " BBBBB ", " " }, - { " HH~HH ", " HBBBBBH ", " HB BH ", "HB BH", "HB BH", - "HB BH", "HB BH", "HB BH", " HB BH ", - " HBBBBBH ", " HHHHH " }, - { " CCCCC ", " C C ", " C C ", "C C", "C C", - "C C", "C C", "C C", " C C ", - " C C ", " CCCCC " }, })) - .addElement('B', ofB |
