aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multiblock
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/tileentities/machines/multiblock
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multiblock')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java58
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java157
2 files changed, 85 insertions, 130 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java
index 4114ee5564..66e9333961 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java
@@ -34,7 +34,7 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.common.tileentities.machines.multiblock.logic.CokeOvenProcessingLogic;
public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOven>
- implements PollutionLogicHost, ProcessingLogicHost {
+ implements PollutionLogicHost, ProcessingLogicHost {
private static IStructureDefinition<MultiBlock_CokeOven> STRUCTURE_DEFINITION = null;
private static final Vec3Impl OFFSET = new Vec3Impl(1, 1, 0);
@@ -79,11 +79,11 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve
protected GT_Multiblock_Tooltip_Builder createTooltip() {
final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
tt.addMachineType("Coke Oven")
- .addInfo("Used for charcoal")
- .beginStructureBlock(3, 3, 3, true)
- .addCasingInfoExactly("Coke Oven Bricks", 25, false)
- .addPollutionAmount(POLLUTION_LOGIC.getPollutionAmount())
- .toolTipFinisher(GT_Values.AuthorBlueWeabo);
+ .addInfo("Used for charcoal")
+ .beginStructureBlock(3, 3, 3, true)
+ .addCasingInfoExactly("Coke Oven Bricks", 25, false)
+ .addPollutionAmount(POLLUTION_LOGIC.getPollutionAmount())
+ .toolTipFinisher(GT_Values.AuthorBlueWeabo);
return tt;
}
@@ -96,18 +96,11 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve
public IStructureDefinition<MultiBlock_CokeOven> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<MultiBlock_CokeOven>builder()
- .addShape(
- MAIN,
- new String[][] { { "AAA", "A~A", "AAA" },
- { "AAA", "A-A", "AAA" },
- { "AAA", "AAA", "AAA" } })
- .addElement(
- 'A',
- addMultiTileCasing(
- "gt.multitileentity.casings",
- getCasingMeta(),
- ITEM_IN | ITEM_OUT))
- .build();
+ .addShape(
+ MAIN,
+ new String[][] { { "AAA", "A~A", "AAA" }, { "AAA", "A-A", "AAA" }, { "AAA", "AAA", "AAA" } })
+ .addElement('A', addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), ITEM_IN | ITEM_OUT))
+ .build();
}
return STRUCTURE_DEFINITION;
}
@@ -120,11 +113,11 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
builder.widget(
- new SlotWidget(inputInventory, 0).setPos(18, 18)
- .setSize(18, 18));
+ new SlotWidget(inputInventory, 0).setPos(18, 18)
+ .setSize(18, 18));
builder.widget(
- new SlotWidget(outputInventory, 0).setPos(36, 36)
- .setSize(18, 18));
+ new SlotWidget(outputInventory, 0).setPos(36, 36)
+ .setSize(18, 18));
builder.widget(createButtons());
}
@@ -136,32 +129,31 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve
if (NetworkUtils.isClient()) {
final FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
// noinspection unchecked
- final List<String> titleLines = fontRenderer.listFormattedStringToWidth(
- title,
- getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2);
+ final List<String> titleLines = fontRenderer
+ .listFormattedStringToWidth(title, getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2);
titleWidth = titleLines.size() > 1 ? getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2
- : fontRenderer.getStringWidth(title);
+ : fontRenderer.getStringWidth(title);
// noinspection PointlessArithmeticExpression
titleHeight = titleLines.size() * fontRenderer.FONT_HEIGHT + (titleLines.size() - 1);
}
final DrawableWidget tab = new DrawableWidget();
final TextWidget text = new TextWidget(title).setDefaultColor(getTitleColor())
- .setTextAlignment(Alignment.CenterLeft)
- .setMaxWidth(titleWidth);
+ .setTextAlignment(Alignment.CenterLeft)
+ .setMaxWidth(titleWidth);
if (GT_Mod.gregtechproxy.mTitleTabStyle == 1) {
tab.setDrawable(getGUITextureSet().getTitleTabAngular())
- .setPos(0, -(titleHeight + TAB_PADDING) + 1)
- .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2);
+ .setPos(0, -(titleHeight + TAB_PADDING) + 1)
+ .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2);
text.setPos(TAB_PADDING + TITLE_PADDING, -titleHeight + TAB_PADDING);
} else {
tab.setDrawable(getGUITextureSet().getTitleTabDark())
- .setPos(0, -(titleHeight + TAB_PADDING * 2) + 1)
- .setSize(titleWidth + (TAB_PADDING + TITLE_PADDING) * 2, titleHeight + TAB_PADDING * 2 - 1);
+ .setPos(0, -(titleHeight + TAB_PADDING * 2) + 1)
+ .setSize(titleWidth + (TAB_PADDING + TITLE_PADDING) * 2, titleHeight + TAB_PADDING * 2 - 1);
text.setPos(TAB_PADDING + TITLE_PADDING, -titleHeight);
}
builder.widget(tab)
- .widget(text);
+ .widget(text);
}
@Override
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 acd611ab12..c2bf782d40 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
@@ -50,67 +50,30 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera
public IStructureDefinition<MultiBlock_Macerator> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<MultiBlock_Macerator>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[][] { { " G~F ", "AAAAA", "AAAAA",
- "AAAAA", " AAA " }, }))
- .addElement(
- 'A',
- ofChain(
- addMultiTileCasing(
- "gt.multitileentity.casings",
- getCasingMeta(),
- ENERGY_IN)))
- .addElement(
- 'B',
- ofChain(
- addMultiTileCasing(
- "gt.multitileentity.casings",
- getCasingMeta(),
- FLUID_IN | ITEM_IN
- | FLUID_OUT
- | ITEM_OUT)))
- .addElement(
- 'C',
- addMultiTileCasing(
- "gt.multitileentity.casings",
- getCasingMeta(),
- NOTHING))
- .addElement(
- 'D',
- addMultiTileCasing(
- "gt.multitileentity.casings",
- getCasingMeta(),
- NOTHING))
- .addElement(
- 'F',
- ofChain(
- addMultiTileCasing(
- "gt.multitileentity.casings",
- 20001,
- NOTHING),
- addMultiTileCasing(
- "gt.multitileentity.casings",
- 20002,
- NOTHING)))
- .addElement(
- 'G',
- addMultiTileCasing(
- "gt.multitileentity.casings",
- 10000,
- 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[][] { { " G~F ", "AAAAA", "AAAAA", "AAAAA", " AAA " }, }))
+ .addElement('A', ofChain(addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), ENERGY_IN)))
+ .addElement(
+ 'B',
+ ofChain(
+ addMultiTileCasing(
+ "gt.multitileentity.casings",
+ getCasingMeta(),
+ FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT)))
+ .addElement('C', addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), NOTHING))
+ .addElement('D', addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), NOTHING))
+ .addElement(
+ 'F',
+ ofChain(
+ addMultiTileCasing("gt.multitileentity.casings", 20001, NOTHING),
+ addMultiTileCasing("gt.multitileentity.casings", 20002, NOTHING)))
+ .addElement('G', addMultiTileCasing("gt.multitileentity.casings", 10000, NOTHING))
+ .build();
}
return STRUCTURE_DEFINITION;
}
@@ -134,19 +97,19 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera
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")
- .addCasingInfoExactly("Test Casing", 60, false)
- .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")
+ .addCasingInfoExactly("Test Casing", 60, false)
+ .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;
}
@@ -185,28 +148,28 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera
// TODO: MTE(Texture)
if (facing == aSide) {
return new ITexture[] {
- // Base Texture
- MACHINE_CASINGS[1][0],
- // Active
- isActive() ? TextureFactory.builder()
- .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE)
- .extFacing()
- .build()
- : TextureFactory.builder()
- .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)
- .extFacing()
- .build(),
- // Active Glow
- isActive() ? TextureFactory.builder()
- .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW)
- .extFacing()
- .glow()
- .build()
- : TextureFactory.builder()
- .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW)
- .extFacing()
- .glow()
- .build() };
+ // Base Texture
+ MACHINE_CASINGS[1][0],
+ // Active
+ isActive() ? TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE)
+ .extFacing()
+ .build()
+ : TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)
+ .extFacing()
+ .build(),
+ // Active Glow
+ isActive() ? TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW)
+ .extFacing()
+ .glow()
+ .build()
+ : TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW)
+ .extFacing()
+ .glow()
+ .build() };
}
// Base Texture
return new ITexture[] { MACHINE_CASINGS[1][0] };
@@ -223,7 +186,7 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera
return false;
} else {
ItemStack[] tItemInputs = getInventoriesForInput().getStacks()
- .toArray(new ItemStack[0]);
+ .toArray(new ItemStack[0]);
return processRecipe(tItemInputs, null);
}
}