From 6f31720697bcc351421a4d86ba3bf749375dd12c Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Aug 2022 10:19:57 +0100 Subject: Update buildscript & apply spotless (#1306) * Update dependencies * Update buildscript, apply spotless --- .../machines/multiblock/MultiBlock_Macerator.java | 108 +++++++++++---------- 1 file changed, 58 insertions(+), 50 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/multiblock') diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java index 23a2a484d1..09aae61527 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java @@ -1,17 +1,5 @@ package gregtech.common.tileentities.machines.multiblock; -import com.gtnewhorizon.structurelib.structure.IStructureDefinition; -import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import com.gtnewhorizon.structurelib.util.Vec3Impl; -import gregtech.api.interfaces.ITexture; -import gregtech.api.multitileentity.multiblock.base.MultiBlockPart; -import gregtech.api.multitileentity.multiblock.base.MultiBlock_Stackable; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.common.render.GT_MultiTexture; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; @@ -24,6 +12,15 @@ import static gregtech.api.multitileentity.multiblock.base.MultiBlockPart.ITEM_I import static gregtech.api.multitileentity.multiblock.base.MultiBlockPart.ITEM_OUT; import static gregtech.api.multitileentity.multiblock.base.MultiBlockPart.NOTHING; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import com.gtnewhorizon.structurelib.util.Vec3Impl; +import gregtech.api.interfaces.ITexture; +import gregtech.api.multitileentity.multiblock.base.MultiBlock_Stackable; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import net.minecraft.block.Block; + public class MultiBlock_Macerator extends MultiBlock_Stackable { private IStructureDefinition STRUCTURE_DEFINITION = null; @@ -36,52 +33,59 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { STRUCTURE_DEFINITION = StructureDefinition.builder() - .addShape(STACKABLE_TOP, transpose(new String[][] { - {" CCC ", "CCCCC", "CCCCC", "CCCCC", " CCC "}, - })) - .addShape(STACKABLE_MIDDLE, transpose(new String[][] { - {" BBB ", " B---B ", "DC---CD", " B---B ", " BBB "}, - })) - .addShape(STACKABLE_BOTTOM, transpose(new String[][] { - {" A~A ", "AAAAA", "AAAAA", "AAAAA", " AAA "}, - })) - .addElement('A', ofChain(addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), ENERGY_IN))) - .addElement('B', ofChain(addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT))) - .addElement('C', addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), NOTHING)) - .addElement('D', addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), NOTHING)) - .build(); + .addShape(STACKABLE_TOP, transpose(new String[][] { + {" CCC ", "CCCCC", "CCCCC", "CCCCC", " CCC "}, + })) + .addShape(STACKABLE_MIDDLE, transpose(new String[][] { + {" BBB ", " B---B ", "DC---CD", " B---B ", " BBB "}, + })) + .addShape(STACKABLE_BOTTOM, transpose(new String[][] { + {" A~A ", "AAAAA", "AAAAA", "AAAAA", " AAA "}, + })) + .addElement('A', ofChain(addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), ENERGY_IN))) + .addElement( + 'B', + ofChain(addMultiTileCasing( + getCasingRegistryID(), getCasingMeta(), FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT))) + .addElement('C', addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), NOTHING)) + .addElement('D', addMultiTileCasing(getCasingRegistryID(), getCasingMeta(), NOTHING)) + .build(); } return STRUCTURE_DEFINITION; } - @Override public short getCasingRegistryID() { + @Override + public short getCasingRegistryID() { return getMultiTileEntityRegistryID(); } - @Override public short getCasingMeta() { + @Override + public short getCasingMeta() { return 18000; } @Override - public boolean hasTop() { return true; } - + public boolean hasTop() { + return true; + } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Macerator") - .addInfo("Controller for the Macerator") - .addSeparator() - .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2+getMaxStacks(), 7, 9, true) - .addController("Bottom Front Center") - .addCasingInfo("Test Casing", 60) - .addEnergyHatch("Any bottom layer casing") - .addInputHatch("Any non-optional external facing casing on the stacks") - .addInputBus("Any non-optional external facing casing on the stacks") - .addOutputHatch("Any non-optional external facing casing on the stacks") - .addOutputBus("Any non-optional external facing casing on the stacks") - .addStructureInfo(String.format("Stackable middle stacks between %d-%d time(s).", getMinStacks(), getMaxStacks())) - .toolTipFinisher("Wildcard"); + .addInfo("Controller for the Macerator") + .addSeparator() + .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2 + getMaxStacks(), 7, 9, true) + .addController("Bottom Front Center") + .addCasingInfo("Test Casing", 60) + .addEnergyHatch("Any bottom layer casing") + .addInputHatch("Any non-optional external facing casing on the stacks") + .addInputBus("Any non-optional external facing casing on the stacks") + .addOutputHatch("Any non-optional external facing casing on the stacks") + .addOutputBus("Any non-optional external facing casing on the stacks") + .addStructureInfo( + String.format("Stackable middle stacks between %d-%d time(s).", getMinStacks(), getMaxStacks())) + .toolTipFinisher("Wildcard"); return tt; } @@ -95,7 +99,6 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable