diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index a79ca38c8..52a2b817e 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -86,7 +86,7 @@ public class FeatureFactory { } public TileEntityBuilder tileEntity(String id, Class teClass, - Function, T> factory) { + Function, T> factory) { return new TileEntityBuilder<>(this, id, teClass, factory).features(this.defaultFeatures); } diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index 9ab12de61..772609354 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -60,8 +60,8 @@ import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.CustomSlotWidget; -import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.ITooltip; +import appeng.client.gui.widgets.Scrollbar; import appeng.client.me.InternalSlotME; import appeng.client.me.SlotDisconnected; import appeng.client.me.SlotME; @@ -70,10 +70,10 @@ import appeng.container.AEBaseContainer; import appeng.container.slot.AppEngCraftingSlot; import appeng.container.slot.AppEngSlot; import appeng.container.slot.AppEngSlot.CalculatedValidity; -import appeng.container.slot.IOptionalSlot; import appeng.container.slot.CraftingTermSlot; import appeng.container.slot.DisabledSlot; import appeng.container.slot.FakeSlot; +import appeng.container.slot.IOptionalSlot; import appeng.container.slot.InaccessibleSlot; import appeng.container.slot.OutputSlot; import appeng.container.slot.PatternTermSlot; diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java index a971b7aa1..d14d1e9d9 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubScreen.java +++ b/src/main/java/appeng/client/gui/implementations/AESubScreen.java @@ -98,8 +98,8 @@ final class AESubScreen { label = previousContainerIcon.getDisplayName().getString(); } ItemRenderer itemRenderer = gui.getMinecraft().getItemRenderer(); - TabButton button = new TabButton(gui.getGuiLeft() + x, gui.getGuiTop() + y, previousContainerIcon, - label, itemRenderer, btn -> goBack()); + TabButton button = new TabButton(gui.getGuiLeft() + x, gui.getGuiTop() + y, previousContainerIcon, label, + itemRenderer, btn -> goBack()); buttonAdder.accept(button); return button; } diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index 5cb390f60..14d7e0e2f 100644 --- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -42,7 +42,8 @@ public class CellWorkbenchScreen extends UpgradeableScreen(this.guiLeft - 18, this.guiTop + 68, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL, this::toggleFuzzyMode)); - this.addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, - act1 -> action("Partition"))); this.addButton( - new ActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, act -> action("Clear"))); - this.copyMode = this.addButton(new ToggleButton(this.guiLeft - 18, this.guiTop + 48, 11 * 16 + 5, - 12 * 16 + 5, GuiText.CopyMode.getLocal(), GuiText.CopyModeDesc.getLocal(), act -> action("CopyMode"))); + new ActionButton(this.guiLeft - 18, this.guiTop + 28, ActionItems.WRENCH, act1 -> action("Partition"))); + this.addButton(new ActionButton(this.guiLeft - 18, this.guiTop + 8, ActionItems.CLOSE, act -> action("Clear"))); + this.copyMode = this.addButton(new ToggleButton(this.guiLeft - 18, this.guiTop + 48, 11 * 16 + 5, 12 * 16 + 5, + GuiText.CopyMode.getLocal(), GuiText.CopyModeDesc.getLocal(), act -> action("CopyMode"))); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java index dd4205830..0853bfa88 100644 --- a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java @@ -48,8 +48,8 @@ public class CondenserScreen extends AEBaseScreen { this.mode = new ServerSettingToggleButton<>(128 + this.guiLeft, 52 + this.guiTop, Settings.CONDENSER_OUTPUT, this.container.getOutput()); - this.addButton(new ProgressBar(this.container, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, - 178, 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy.getLocal())); + this.addButton(new ProgressBar(this.container, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, 178, + 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy.getLocal())); this.addButton(this.mode); } diff --git a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java index 0e26789f5..341c6cd25 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java @@ -43,8 +43,8 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEColor; import appeng.client.gui.AEBaseScreen; -import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.ISortSource; +import appeng.client.gui.widgets.Scrollbar; import appeng.container.implementations.CraftingCPUContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; diff --git a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java index f00c2d69f..6f5493946 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java @@ -37,7 +37,8 @@ public class CraftingStatusScreen extends CraftingCPUScreen clear())); + ActionButton clearBtn = this.addButton( + new ActionButton(this.guiLeft + 92, this.guiTop + this.ySize - 156, ActionItems.STASH, btn -> clear())); clearBtn.setHalfSize(true); } diff --git a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java index 7f24cee41..9cae57199 100644 --- a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java +++ b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java @@ -37,7 +37,8 @@ public class FormationPlaneScreen extends UpgradeableScreen placeMode; - public FormationPlaneScreen(FormationPlaneContainer container, PlayerInventory playerInventory, ITextComponent title) { + public FormationPlaneScreen(FormationPlaneContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } diff --git a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java index 880803638..246124986 100644 --- a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java @@ -46,8 +46,7 @@ public class InscriberScreen extends AEBaseScreen { public void init() { super.init(); - this.pb = new ProgressBar(this.container, "guis/inscriber.png", 135, 39, 135, 177, 6, 18, - Direction.VERTICAL); + this.pb = new ProgressBar(this.container, "guis/inscriber.png", 135, 39, 135, 177, 6, 18, Direction.VERTICAL); this.addButton(this.pb); } diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java index 10bf73f48..7ff929395 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java @@ -49,8 +49,7 @@ public class InterfaceScreen extends UpgradeableScreen { this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui())); - this.blockMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, - YesNo.NO); + this.blockMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO); this.addButton(this.blockMode); this.interfaceMode = new ToggleButton(this.guiLeft - 18, this.guiTop + 26, 84, 85, diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index f8ea5a6b5..b3112f7d3 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -44,8 +44,8 @@ import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; import appeng.client.ActionKey; import appeng.client.gui.AEBaseScreen; -import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.AETextField; +import appeng.client.gui.widgets.Scrollbar; import appeng.client.me.ClientDCInternalInv; import appeng.client.me.SlotDisconnected; import appeng.container.implementations.InterfaceTerminalContainer; @@ -68,7 +68,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen extends AEBas offset += 20; if (!(this instanceof MEPortableCellScreen) || this instanceof WirelessTermScreen) { - this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, - terminalStyle, this::toggleTerminalStyle)); + this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, terminalStyle, + this::toggleTerminalStyle)); } this.searchField = new AETextField(this.font, this.guiLeft + Math.max(80, this.offsetX), this.guiTop + 4, 90, diff --git a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java index 31fcbd637..11717c749 100644 --- a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java @@ -25,7 +25,8 @@ import appeng.container.implementations.MEPortableCellContainer; public class MEPortableCellScreen extends MEMonitorableScreen { - public MEPortableCellScreen(MEPortableCellContainer container, PlayerInventory playerInventory, ITextComponent title) { + public MEPortableCellScreen(MEPortableCellContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java index f36c3bb1a..5845666ad 100644 --- a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java @@ -34,7 +34,7 @@ public class MolecularAssemblerScreen extends UpgradeableScreen im private final int rows = 4; private int tooltip = -1; - public NetworkStatusScreen(NetworkStatusContainer container, PlayerInventory playerInventory, ITextComponent title) { + public NetworkStatusScreen(NetworkStatusContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); final Scrollbar scrollbar = new Scrollbar(); diff --git a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java index 8a78a696f..1461b52d0 100644 --- a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java +++ b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java @@ -77,8 +77,8 @@ public class PatternTermScreen extends MEMonitorableScreen this.substitutionsDisabledBtn.setHalfSize(true); this.addButton(this.substitutionsDisabledBtn); - ActionButton clearBtn = new ActionButton(this.guiLeft + 74, this.guiTop + this.ySize - 163, - ActionItems.CLOSE, act -> clear()); + ActionButton clearBtn = new ActionButton(this.guiLeft + 74, this.guiTop + this.ySize - 163, ActionItems.CLOSE, + act -> clear()); clearBtn.setHalfSize(true); this.addButton(clearBtn); diff --git a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java index 71d95c1be..7ea9bbe48 100644 --- a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java @@ -38,7 +38,7 @@ public class SecurityStationScreen extends MEMonitorableScreen { - public SpatialIOPortScreen(SpatialIOPortContainer container, PlayerInventory playerInventory, ITextComponent title) { + public SpatialIOPortScreen(SpatialIOPortContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 199; } diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java index 1f5a0f2f3..700c7bf2f 100644 --- a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java @@ -34,8 +34,8 @@ import appeng.container.implementations.PriorityContainer; import appeng.container.implementations.StorageBusContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.SwitchGuisPacket; import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.SwitchGuisPacket; public class StorageBusScreen extends UpgradeableScreen { diff --git a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java index 9b37c404e..2568cbd8e 100644 --- a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java @@ -36,7 +36,7 @@ public class VibrationChamberScreen extends AEBaseScreen { - public WirelessTermScreen(MEPortableCellContainer container, PlayerInventory playerInventory, ITextComponent title) { + public WirelessTermScreen(MEPortableCellContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/widgets/AETextField.java b/src/main/java/appeng/client/gui/widgets/AETextField.java index 4e920a63a..b12973900 100644 --- a/src/main/java/appeng/client/gui/widgets/AETextField.java +++ b/src/main/java/appeng/client/gui/widgets/AETextField.java @@ -51,7 +51,7 @@ public class AETextField extends TextFieldWidget { * @param height absolute height */ public AETextField(final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, - final int height) { + final int height) { super(fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - (int) fontRenderer.getCharWidth('_'), height - 2 * PADDING, ""); diff --git a/src/main/java/appeng/client/gui/widgets/NumberBox.java b/src/main/java/appeng/client/gui/widgets/NumberBox.java index 16570f90f..602e1e0e9 100644 --- a/src/main/java/appeng/client/gui/widgets/NumberBox.java +++ b/src/main/java/appeng/client/gui/widgets/NumberBox.java @@ -27,7 +27,7 @@ public class NumberBox extends TextFieldWidget { private final Class type; public NumberBox(final FontRenderer fontRenderer, final int x, final int y, final int width, final int height, - final Class type) { + final Class type) { super(fontRenderer, x, y, width, height, "0"); this.type = type; } diff --git a/src/main/java/appeng/client/gui/widgets/ProgressBar.java b/src/main/java/appeng/client/gui/widgets/ProgressBar.java index 5b2b1568e..eefff2b91 100644 --- a/src/main/java/appeng/client/gui/widgets/ProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/ProgressBar.java @@ -37,12 +37,12 @@ public class ProgressBar extends Widget implements ITooltip { private String fullMsg; public ProgressBar(final IProgressProvider source, final String texture, final int posX, final int posY, - final int u, final int y, final int width, final int height, final Direction dir) { + final int u, final int y, final int width, final int height, final Direction dir) { this(source, texture, posX, posY, u, y, width, height, dir, null); } public ProgressBar(final IProgressProvider source, final String texture, final int posX, final int posY, - final int u, final int y, final int width, final int height, final Direction dir, final String title) { + final int u, final int y, final int width, final int height, final Direction dir, final String title) { super(posX, posY, width, height, ""); this.source = source; this.texture = new ResourceLocation("appliedenergistics2", "textures/" + texture); diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index 582aaf580..50ddad377 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -65,12 +65,12 @@ public class SettingToggleButton> extends IconButton { } public SettingToggleButton(final int x, final int y, final Settings setting, final T val, - IHandler> onPress) { + IHandler> onPress) { this(x, y, setting, val, t -> true, onPress); } - public SettingToggleButton(final int x, final int y, final Settings setting, final T val, - Predicate isValidValue, IHandler> onPress) { + public SettingToggleButton(final int x, final int y, final Settings setting, final T val, Predicate isValidValue, + IHandler> onPress) { super(x, y, SettingToggleButton::onPress); this.onPress = onPress; diff --git a/src/main/java/appeng/client/gui/widgets/TabButton.java b/src/main/java/appeng/client/gui/widgets/TabButton.java index c63939aa9..6ae1e69f9 100644 --- a/src/main/java/appeng/client/gui/widgets/TabButton.java +++ b/src/main/java/appeng/client/gui/widgets/TabButton.java @@ -36,7 +36,7 @@ public class TabButton extends Button implements ITooltip { private ItemStack myItem; public TabButton(final int x, final int y, final int ico, final String message, final ItemRenderer ir, - IPressable onPress) { + IPressable onPress) { super(x, y, 22, 22, message, onPress); this.myIcon = ico; @@ -53,7 +53,7 @@ public class TabButton extends Button implements ITooltip { * @param ir renderer */ public TabButton(final int x, final int y, final ItemStack ico, final String message, final ItemRenderer ir, - IPressable onPress) { + IPressable onPress) { super(x, y, 22, 22, message, onPress); this.myItem = ico; this.itemRenderer = ir; diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java index 8ea34376d..8d2f63560 100644 --- a/src/main/java/appeng/client/gui/widgets/ToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -41,7 +41,7 @@ public class ToggleButton extends Button implements ITooltip { private boolean isActive; public ToggleButton(final int x, final int y, final int on, final int off, final String displayName, - final String displayHint, IPressable onPress) { + final String displayHint, IPressable onPress) { super(x, y, 16, 16, "", onPress); this.iconIdxOn = on; this.iconIdxOff = off; diff --git a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java index 3f6afde46..64ea2fbe5 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java +++ b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java @@ -43,7 +43,7 @@ public class CraftingMonitorTESR extends TileEntityRenderer { } @Override - public void render(CrankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLightIn, - int combinedOverlayIn) { + public void render(CrankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + int combinedLightIn, int combinedOverlayIn) { // Apply GL transformations relative to the center of the block: 1) TE rotation // and 2) crank rotation diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java index 48632f4b9..18c42269f 100644 --- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java @@ -69,7 +69,7 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer @Override public void render(InscriberTileEntity tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLight, int combinedOverlay) { + int combinedLight, int combinedOverlay) { // render inscriber diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index 6374db6e8..866f57ddf 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -69,7 +69,7 @@ public class SkyChestTESR extends TileEntityRenderer { @Override public void render(SkyChestTileEntity tileEntityIn, float partialTicks, MatrixStack matrixStackIn, - IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) { + IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) { matrixStackIn.push(); float f = tileEntityIn.getForward().getHorizontalAngle(); matrixStackIn.translate(0.5D, 0.5D, 0.5D); diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java index 666186051..5b3a1835b 100644 --- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java @@ -49,7 +49,7 @@ public class SkyCompassTESR extends TileEntityRenderer { @Override public void render(SkyCompassTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLightIn, int combinedOverlayIn) { + int combinedLightIn, int combinedOverlayIn) { if (blockRenderer == null) { blockRenderer = Minecraft.getInstance().getBlockRendererDispatcher(); diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 9fed47136..f1cef6287 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -65,9 +65,9 @@ import appeng.container.slot.PlayerHotBarSlot; import appeng.container.slot.PlayerInvSlot; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.InventoryActionPacket; import appeng.core.sync.packets.TargetItemStackPacket; -import appeng.core.sync.packets.ConfigValuePacket; import appeng.helpers.ICustomNameObject; import appeng.helpers.InventoryAction; import appeng.me.helpers.PlayerSource; @@ -97,12 +97,12 @@ public abstract class AEBaseContainer extends Container { private List playerInventorySlots = null; public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final TileEntity myTile, - final IPart myPart) { + final IPart myPart) { this(containerType, id, ip, myTile, myPart, null); } public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final TileEntity myTile, - final IPart myPart, final IGuiItemObject gio) { + final IPart myPart, final IGuiItemObject gio) { super(containerType, id); this.invPlayer = ip; this.tileEntity = myTile; diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index 1ba319a2b..3d3662315 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -30,8 +30,8 @@ import net.minecraft.util.text.ITextComponent; import appeng.container.AEBaseContainer; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.ProgressBarPacket; import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.ProgressBarPacket; /** * This class is responsible for synchronizing Container-fields from server to diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java index 00626eb51..cc52dcf36 100644 --- a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java +++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java @@ -44,8 +44,8 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.OptionalRestrictedInputSlot; import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.OptionalRestrictedInputSlot; import appeng.container.slot.RestrictedInputSlot; import appeng.tile.misc.CellWorkbenchTileEntity; import appeng.util.EnumCycler; diff --git a/src/main/java/appeng/container/implementations/ChestContainer.java b/src/main/java/appeng/container/implementations/ChestContainer.java index ee640a364..851b8acbd 100644 --- a/src/main/java/appeng/container/implementations/ChestContainer.java +++ b/src/main/java/appeng/container/implementations/ChestContainer.java @@ -33,8 +33,8 @@ public class ChestContainer extends AEBaseContainer { public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>(ChestContainer::new, - ChestTileEntity.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper = new ContainerHelper<>( + ChestContainer::new, ChestTileEntity.class, SecurityPermissions.BUILD); public ChestContainer(int id, final PlayerInventory ip, final ChestTileEntity chest) { super(TYPE, id, ip, chest, null); diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java index e6d47d3fa..026ee194c 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java @@ -44,8 +44,8 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.helpers.ICustomNameObject; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.CraftingCPUCluster; diff --git a/src/main/java/appeng/container/implementations/DriveContainer.java b/src/main/java/appeng/container/implementations/DriveContainer.java index 9f0649d39..cbc23d6ab 100644 --- a/src/main/java/appeng/container/implementations/DriveContainer.java +++ b/src/main/java/appeng/container/implementations/DriveContainer.java @@ -32,8 +32,8 @@ public class DriveContainer extends AEBaseContainer { public static ContainerType TYPE; - private static final ContainerHelper helper = new ContainerHelper<>(DriveContainer::new, - DriveTileEntity.class); + private static final ContainerHelper helper = new ContainerHelper<>( + DriveContainer::new, DriveTileEntity.class); public static DriveContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java index 1e7b0a10b..21830b75d 100644 --- a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java +++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java @@ -31,8 +31,8 @@ import appeng.api.config.Upgrades; import appeng.api.config.YesNo; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.OptionalTypeOnlyFakeSlot; import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.OptionalTypeOnlyFakeSlot; import appeng.container.slot.RestrictedInputSlot; import appeng.parts.automation.FormationPlanePart; import appeng.util.Platform; diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java index ddd8c81fb..ed8438156 100644 --- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java +++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java @@ -68,8 +68,8 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.RestrictedInputSlot; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.me.helpers.ChannelPowerSrc; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -110,7 +110,7 @@ public class MEMonitorableContainer extends AEBaseContainer } public MEMonitorableContainer(ContainerType containerType, int id, PlayerInventory ip, - final ITerminalHost monitorable, final boolean bindInventory) { + final ITerminalHost monitorable, final boolean bindInventory) { super(containerType, id, ip, monitorable instanceof TileEntity ? (TileEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null, monitorable instanceof IGuiItemObject ? (IGuiItemObject) monitorable : null); diff --git a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java index 497cdc4d5..39509ee9c 100644 --- a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java +++ b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java @@ -56,7 +56,7 @@ public class MEPortableCellContainer extends MEMonitorableContainer { } protected MEPortableCellContainer(ContainerType type, int id, - final PlayerInventory ip, final IPortableCell monitorable) { + final PlayerInventory ip, final IPortableCell monitorable) { super(type, id, ip, monitorable, false); if (monitorable instanceof IInventorySlotAware) { final int slotIndex = ((IInventorySlotAware) monitorable).getInventorySlot(); diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index e17c0b2a1..2205c9243 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -54,9 +54,9 @@ import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.ContainerNull; import appeng.container.guisync.GuiSync; +import appeng.container.slot.FakeCraftingMatrixSlot; import appeng.container.slot.IOptionalSlotHost; import appeng.container.slot.OptionalFakeSlot; -import appeng.container.slot.FakeCraftingMatrixSlot; import appeng.container.slot.PatternOutputsSlot; import appeng.container.slot.PatternTermSlot; import appeng.container.slot.RestrictedInputSlot; diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java index 77469ce31..b5e0fb3a9 100644 --- a/src/main/java/appeng/container/implementations/StorageBusContainer.java +++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java @@ -40,8 +40,8 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.OptionalTypeOnlyFakeSlot; import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.OptionalTypeOnlyFakeSlot; import appeng.container.slot.RestrictedInputSlot; import appeng.parts.misc.StorageBusPart; import appeng.util.Platform; diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java index 92a37712d..f6abbd227 100644 --- a/src/main/java/appeng/container/implementations/UpgradeableContainer.java +++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java @@ -43,10 +43,10 @@ import appeng.api.util.IConfigManager; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; +import appeng.container.slot.FakeTypeOnlySlot; import appeng.container.slot.IOptionalSlotHost; import appeng.container.slot.OptionalFakeSlot; import appeng.container.slot.OptionalTypeOnlyFakeSlot; -import appeng.container.slot.FakeTypeOnlySlot; import appeng.container.slot.RestrictedInputSlot; import appeng.items.contents.NetworkToolViewer; import appeng.items.tools.NetworkToolItem; @@ -85,7 +85,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl } public UpgradeableContainer(ContainerType containerType, int id, final PlayerInventory ip, - final IUpgradeableHost te) { + final IUpgradeableHost te) { super(containerType, id, ip, (TileEntity) (te instanceof TileEntity ? te : null), (IPart) (te instanceof IPart ? te : null)); this.upgradeable = te; diff --git a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java index 9f02101ee..8676798a0 100644 --- a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java +++ b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java @@ -52,7 +52,8 @@ public class VibrationChamberContainer extends AEBaseContainer implements IProgr @GuiSync(1) public int remainingBurnTime = 0; - public VibrationChamberContainer(int id, final PlayerInventory ip, final VibrationChamberTileEntity vibrationChamber) { + public VibrationChamberContainer(int id, final PlayerInventory ip, + final VibrationChamberTileEntity vibrationChamber) { super(TYPE, id, ip, vibrationChamber, null); this.vibrationChamber = vibrationChamber; diff --git a/src/main/java/appeng/container/interfaces/IProgressProvider.java b/src/main/java/appeng/container/interfaces/IProgressProvider.java index 7d1e5e3c0..59d7ad281 100644 --- a/src/main/java/appeng/container/interfaces/IProgressProvider.java +++ b/src/main/java/appeng/container/interfaces/IProgressProvider.java @@ -23,9 +23,8 @@ import appeng.client.gui.widgets.ProgressBar; /** * This interface provides the data for anything simulating a progress. * - * Its main use is in combination with the - * {@link ProgressBar}, which ensures to scale it - * to a percentage of 0 to 100. + * Its main use is in combination with the {@link ProgressBar}, which ensures to + * scale it to a percentage of 0 to 100. */ public interface IProgressProvider { diff --git a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java index 60d204c3a..163ea77c1 100644 --- a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java +++ b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java @@ -30,7 +30,7 @@ public class CraftingMatrixSlot extends AppEngSlot { private final IInventory wrappedInventory; public CraftingMatrixSlot(final AEBaseContainer c, final IItemHandler par1iInventory, final int par2, - final int par3, final int par4) { + final int par3, final int par4) { super(par1iInventory, par2, par3, par4); this.c = c; this.wrappedInventory = new WrapperInvItemHandler(par1iInventory); diff --git a/src/main/java/appeng/container/slot/CraftingTermSlot.java b/src/main/java/appeng/container/slot/CraftingTermSlot.java index 8a1939b92..410c5cfa9 100644 --- a/src/main/java/appeng/container/slot/CraftingTermSlot.java +++ b/src/main/java/appeng/container/slot/CraftingTermSlot.java @@ -66,8 +66,8 @@ public class CraftingTermSlot extends AppEngCraftingSlot { private final IContainerCraftingPacket container; public CraftingTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, - final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) { + final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, + final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) { super(player, cMatrix, output, 0, x, y); this.energySrc = energySrc; this.storage = storage; diff --git a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java index 20fb3fb38..b05f032b6 100644 --- a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java +++ b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java @@ -28,7 +28,7 @@ public class MolecularAssemblerPatternSlot extends AppEngSlot { private final MolecularAssemblerContainer mac; public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final IItemHandler i, final int slotIdx, - final int x, final int y) { + final int x, final int y) { super(i, slotIdx, x, y); this.mac = mac; } diff --git a/src/main/java/appeng/container/slot/OptionalFakeSlot.java b/src/main/java/appeng/container/slot/OptionalFakeSlot.java index ff2460146..f3d5c7a3e 100644 --- a/src/main/java/appeng/container/slot/OptionalFakeSlot.java +++ b/src/main/java/appeng/container/slot/OptionalFakeSlot.java @@ -32,7 +32,7 @@ public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot { private boolean renderDisabled = true; public OptionalFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + final int y, final int offX, final int offY, final int groupNum) { super(inv, idx, x + offX * 18, y + offY * 18); this.srcX = x; this.srcY = y; diff --git a/src/main/java/appeng/container/slot/OptionalNormalSlot.java b/src/main/java/appeng/container/slot/OptionalNormalSlot.java index 826040c3a..35d625f45 100644 --- a/src/main/java/appeng/container/slot/OptionalNormalSlot.java +++ b/src/main/java/appeng/container/slot/OptionalNormalSlot.java @@ -26,7 +26,7 @@ public class OptionalNormalSlot extends AppEngSlot implements IOptionalSlot { private final IOptionalSlotHost host; public OptionalNormalSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int slot, - final int xPos, final int yPos, final int groupNum) { + final int xPos, final int yPos, final int groupNum) { super(inv, slot, xPos, yPos); this.groupNum = groupNum; this.host = containerBus; diff --git a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java index 8872e3d4d..c4460a2e8 100644 --- a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java @@ -27,7 +27,7 @@ public class OptionalRestrictedInputSlot extends RestrictedInputSlot { private final IOptionalSlotHost host; public OptionalRestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final IOptionalSlotHost host, - final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { + final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { super(valid, i, slotIndex, x, y, invPlayer); this.groupNum = grpNum; this.host = host; diff --git a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java index c719d7553..e523a8a4b 100644 --- a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java +++ b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java @@ -24,7 +24,7 @@ import net.minecraftforge.items.IItemHandler; public class OptionalTypeOnlyFakeSlot extends OptionalFakeSlot { public OptionalTypeOnlyFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, - final int x, final int y, final int offX, final int offY, final int groupNum) { + final int x, final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/PatternOutputsSlot.java b/src/main/java/appeng/container/slot/PatternOutputsSlot.java index 2a9d2f739..81be5c9cf 100644 --- a/src/main/java/appeng/container/slot/PatternOutputsSlot.java +++ b/src/main/java/appeng/container/slot/PatternOutputsSlot.java @@ -23,7 +23,7 @@ import net.minecraftforge.items.IItemHandler; public class PatternOutputsSlot extends OptionalFakeSlot { public PatternOutputsSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/PatternTermSlot.java b/src/main/java/appeng/container/slot/PatternTermSlot.java index 9c3112157..49c1cf72d 100644 --- a/src/main/java/appeng/container/slot/PatternTermSlot.java +++ b/src/main/java/appeng/container/slot/PatternTermSlot.java @@ -37,9 +37,9 @@ public class PatternTermSlot extends CraftingTermSlot { private final IOptionalSlotHost host; public PatternTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, - final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, - final IContainerCraftingPacket c) { + final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, + final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, + final IContainerCraftingPacket c) { super(player, mySrc, energySrc, storage, cMatrix, secondMatrix, output, x, y, c); this.host = h; diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java index a21b867ee..e217bcd95 100644 --- a/src/main/java/appeng/container/slot/RestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -71,7 +71,7 @@ public class RestrictedInputSlot extends AppEngSlot { private int stackLimit = -1; public RestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final int slotIndex, final int x, - final int y, final PlayerInventory p) { + final int y, final PlayerInventory p) { super(i, slotIndex, x, y); this.which = valid; this.setIIcon(valid.IIcon); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 7c02f347f..2bc376fe6 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -325,7 +325,7 @@ final class Registration { } private ContainerType registerContainer(IForgeRegistry> registry, - String id, IContainerFactory factory, ContainerOpener.Opener opener) { + String id, IContainerFactory factory, ContainerOpener.Opener opener) { ContainerType type = IForgeContainerType.create(factory); type.setRegistryName(AppEng.MOD_ID, id); registry.register(type); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 780da2dc2..968800608 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -40,50 +40,50 @@ import appeng.block.AEBaseBlockItemChargeable; import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; import appeng.block.crafting.CraftingMonitorBlock; import appeng.block.crafting.CraftingStorageBlock; -import appeng.block.crafting.MolecularAssemblerBlock; -import appeng.block.crafting.CraftingUnitBlock; import appeng.block.crafting.CraftingStorageItem; +import appeng.block.crafting.CraftingUnitBlock; +import appeng.block.crafting.MolecularAssemblerBlock; import appeng.block.grindstone.CrankBlock; import appeng.block.grindstone.GrinderBlock; import appeng.block.misc.CellWorkbenchBlock; import appeng.block.misc.ChargerBlock; import appeng.block.misc.CondenserBlock; import appeng.block.misc.InscriberBlock; +import appeng.block.misc.InscriberRendering; import appeng.block.misc.InterfaceBlock; import appeng.block.misc.LightDetectorBlock; import appeng.block.misc.QuartzFixtureBlock; import appeng.block.misc.QuartzGrowthAcceleratorBlock; import appeng.block.misc.SecurityStationBlock; +import appeng.block.misc.SecurityStationRendering; import appeng.block.misc.SkyCompassBlock; +import appeng.block.misc.SkyCompassRendering; import appeng.block.misc.TinyTNTBlock; import appeng.block.misc.VibrationChamberBlock; -import appeng.block.misc.InscriberRendering; -import appeng.block.misc.SecurityStationRendering; -import appeng.block.misc.SkyCompassRendering; import appeng.block.networking.CableBusBlock; +import appeng.block.networking.CableBusRendering; import appeng.block.networking.ControllerBlock; +import appeng.block.networking.ControllerRendering; import appeng.block.networking.CreativeEnergyCellBlock; import appeng.block.networking.DenseEnergyCellBlock; import appeng.block.networking.EnergyAcceptorBlock; import appeng.block.networking.EnergyCellBlock; import appeng.block.networking.WirelessBlock; -import appeng.block.networking.CableBusRendering; -import appeng.block.networking.ControllerRendering; import appeng.block.networking.WirelessRendering; import appeng.block.paint.PaintSplotchesBlock; import appeng.block.paint.PaintSplotchesRendering; +import appeng.block.qnb.QuantumBridgeRendering; import appeng.block.qnb.QuantumLinkChamberBlock; import appeng.block.qnb.QuantumRingBlock; -import appeng.block.qnb.QuantumBridgeRendering; import appeng.block.spatial.MatrixFrameBlock; import appeng.block.spatial.SpatialIOPortBlock; import appeng.block.spatial.SpatialPylonBlock; import appeng.block.storage.ChestBlock; +import appeng.block.storage.ChestRendering; import appeng.block.storage.DriveBlock; +import appeng.block.storage.DriveRendering; import appeng.block.storage.IOPortBlock; import appeng.block.storage.SkyChestBlock; -import appeng.block.storage.ChestRendering; -import appeng.block.storage.DriveRendering; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.FeatureFactory; import appeng.bootstrap.IBlockRendering; @@ -101,14 +101,14 @@ import appeng.client.render.tesr.CrankTESR; import appeng.client.render.tesr.DriveLedTileEntityRenderer; import appeng.client.render.tesr.SkyChestTESR; import appeng.debug.ChunkLoaderBlock; -import appeng.debug.CubeGeneratorBlock; -import appeng.debug.EnergyGeneratorBlock; -import appeng.debug.ItemGenBlock; -import appeng.debug.PhantomNodeBlock; import appeng.debug.ChunkLoaderTileEntity; +import appeng.debug.CubeGeneratorBlock; import appeng.debug.CubeGeneratorTileEntity; +import appeng.debug.EnergyGeneratorBlock; import appeng.debug.EnergyGeneratorTileEntity; +import appeng.debug.ItemGenBlock; import appeng.debug.ItemGenTileEntity; +import appeng.debug.PhantomNodeBlock; import appeng.debug.PhantomNodeTileEntity; import appeng.decorative.AEDecorativeBlock; import appeng.decorative.solid.ChargedQuartzOreBlock; @@ -122,10 +122,10 @@ import appeng.entity.TinyTNTPrimedEntity; import appeng.fluids.block.FluidInterfaceBlock; import appeng.fluids.tile.FluidInterfaceTileEntity; import appeng.hooks.TinyTNTDispenseItemBehavior; -import appeng.tile.crafting.MolecularAssemblerRenderer; import appeng.tile.crafting.CraftingMonitorTileEntity; import appeng.tile.crafting.CraftingStorageTileEntity; import appeng.tile.crafting.CraftingTileEntity; +import appeng.tile.crafting.MolecularAssemblerRenderer; import appeng.tile.crafting.MolecularAssemblerTileEntity; import appeng.tile.grindstone.CrankTileEntity; import appeng.tile.grindstone.GrinderTileEntity; @@ -313,7 +313,8 @@ public final class ApiBlocks implements IBlocks { Block.Properties skyStoneChestProps = defaultProps(Material.ROCK).hardnessAndResistance(50, 150).notSolid(); - TileEntityDefinition skyChestTile = registry.tileEntity("sky_chest", SkyChestTileEntity.class, SkyChestTileEntity::new) + TileEntityDefinition skyChestTile = registry + .tileEntity("sky_chest", SkyChestTileEntity.class, SkyChestTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -337,7 +338,8 @@ public final class ApiBlocks implements IBlocks { this.grindstone = registry .block("grindstone", () -> new GrinderBlock(defaultProps(Material.ROCK).hardnessAndResistance(3.2f))) .features(AEFeature.GRIND_STONE) - .tileEntity(registry.tileEntity("grindstone", GrinderTileEntity.class, GrinderTileEntity::new).build()).build(); + .tileEntity(registry.tileEntity("grindstone", GrinderTileEntity.class, GrinderTileEntity::new).build()) + .build(); this.crank = registry .block("crank", () -> new CrankBlock( @@ -359,7 +361,8 @@ public final class ApiBlocks implements IBlocks { .build(); this.wirelessAccessPoint = registry.block("wireless_access_point", WirelessBlock::new) .features(AEFeature.WIRELESS_ACCESS_TERMINAL) - .tileEntity(registry.tileEntity("wireless_access_point", WirelessTileEntity.class, WirelessTileEntity::new).build()) + .tileEntity(registry + .tileEntity("wireless_access_point", WirelessTileEntity.class, WirelessTileEntity::new).build()) .rendering(new WirelessRendering()).build(); this.charger = registry.block("charger", ChargerBlock::new).features(AEFeature.CHARGER) .tileEntity(registry.tileEntity("charger", ChargerTileEntity.class, ChargerTileEntity::new) @@ -385,8 +388,10 @@ public final class ApiBlocks implements IBlocks { .registerDispenseBehavior(item, new TinyTNTDispenseItemBehavior())) .build(); this.securityStation = registry.block("security_station", SecurityStationBlock::new) - .features(AEFeature.SECURITY).tileEntity(registry - .tileEntity("security_station", SecurityStationTileEntity.class, SecurityStationTileEntity::new).build()) + .features(AEFeature.SECURITY) + .tileEntity(registry + .tileEntity("security_station", SecurityStationTileEntity.class, SecurityStationTileEntity::new) + .build()) .rendering(new SecurityStationRendering()).build(); TileEntityDefinition quantumRingTile = registry @@ -398,14 +403,17 @@ public final class ApiBlocks implements IBlocks { .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) .rendering(new QuantumBridgeRendering()).build(); this.spatialPylon = registry.block("spatial_pylon", SpatialPylonBlock::new).features(AEFeature.SPATIAL_IO) - .tileEntity(registry.tileEntity("spatial_pylon", SpatialPylonTileEntity.class, SpatialPylonTileEntity::new).build()) + .tileEntity(registry + .tileEntity("spatial_pylon", SpatialPylonTileEntity.class, SpatialPylonTileEntity::new).build()) .rendering(new SpatialPylonRendering()).build(); this.spatialIOPort = registry.block("spatial_io_port", SpatialIOPortBlock::new).features(AEFeature.SPATIAL_IO) - .tileEntity( - registry.tileEntity("spatial_io_port", SpatialIOPortTileEntity.class, SpatialIOPortTileEntity::new).build()) + .tileEntity(registry + .tileEntity("spatial_io_port", SpatialIOPortTileEntity.class, SpatialIOPortTileEntity::new) + .build()) .build(); - this.controller = registry.block("controller", ControllerBlock::new).features(AEFeature.CHANNELS) - .tileEntity(registry.tileEntity("controller", ControllerTileEntity.class, ControllerTileEntity::new).build()) + this.controller = registry + .block("controller", ControllerBlock::new).features(AEFeature.CHANNELS).tileEntity(registry + .tileEntity("controller", ControllerTileEntity.class, ControllerTileEntity::new).build()) .rendering(new ControllerRendering()).build(); this.drive = registry.block("drive", DriveBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_DRIVE) .tileEntity(registry.tileEntity("drive", DriveTileEntity.class, DriveTileEntity::new) @@ -421,46 +429,53 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry.tileEntity("chest", ChestTileEntity.class, ChestTileEntity::new).build()) .rendering(new ChestRendering()).build(); this.iface = registry.block("interface", InterfaceBlock::new).features(AEFeature.INTERFACE) - .tileEntity(registry.tileEntity("interface", InterfaceTileEntity.class, InterfaceTileEntity::new).build()).build(); + .tileEntity( + registry.tileEntity("interface", InterfaceTileEntity.class, InterfaceTileEntity::new).build()) + .build(); this.fluidIface = registry.block("fluid_interface", FluidInterfaceBlock::new) - .features(AEFeature.FLUID_INTERFACE).tileEntity(registry - .tileEntity("fluid_interface", FluidInterfaceTileEntity.class, FluidInterfaceTileEntity::new).build()) + .features(AEFeature.FLUID_INTERFACE) + .tileEntity(registry + .tileEntity("fluid_interface", FluidInterfaceTileEntity.class, FluidInterfaceTileEntity::new) + .build()) .build(); this.cellWorkbench = registry.block("cell_workbench", CellWorkbenchBlock::new).features(AEFeature.STORAGE_CELLS) - .tileEntity( - registry.tileEntity("cell_workbench", CellWorkbenchTileEntity.class, CellWorkbenchTileEntity::new).build()) + .tileEntity(registry + .tileEntity("cell_workbench", CellWorkbenchTileEntity.class, CellWorkbenchTileEntity::new) + .build()) .build(); this.iOPort = registry.block("io_port", IOPortBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.IO_PORT) - .tileEntity(registry.tileEntity("io_port", IOPortTileEntity.class, IOPortTileEntity::new).build()).build(); + .tileEntity(registry.tileEntity("io_port", IOPortTileEntity.class, IOPortTileEntity::new).build()) + .build(); this.condenser = registry.block("condenser", CondenserBlock::new).features(AEFeature.CONDENSER) - .tileEntity(registry.tileEntity("condenser", CondenserTileEntity.class, CondenserTileEntity::new).build()).build(); + .tileEntity( + registry.tileEntity("condenser", CondenserTileEntity.class, CondenserTileEntity::new).build()) + .build(); this.energyAcceptor = registry.block("energy_acceptor", EnergyAcceptorBlock::new) - .features(AEFeature.ENERGY_ACCEPTOR).tileEntity(registry - .tileEntity("energy_acceptor", EnergyAcceptorTileEntity.class, EnergyAcceptorTileEntity::new).build()) + .features(AEFeature.ENERGY_ACCEPTOR) + .tileEntity(registry + .tileEntity("energy_acceptor", EnergyAcceptorTileEntity.class, EnergyAcceptorTileEntity::new) + .build()) .build(); this.vibrationChamber = registry.block("vibration_chamber", VibrationChamberBlock::new) - .features(AEFeature.POWER_GEN) - .tileEntity(registry - .tileEntity("vibration_chamber", VibrationChamberTileEntity.class, VibrationChamberTileEntity::new).build()) + .features(AEFeature.POWER_GEN).tileEntity(registry.tileEntity("vibration_chamber", + VibrationChamberTileEntity.class, VibrationChamberTileEntity::new).build()) .build(); this.quartzGrowthAccelerator = registry.block("quartz_growth_accelerator", QuartzGrowthAcceleratorBlock::new) .tileEntity(registry.tileEntity("quartz_growth_accelerator", QuartzGrowthAcceleratorTileEntity.class, QuartzGrowthAcceleratorTileEntity::new).build()) .features(AEFeature.CRYSTAL_GROWTH_ACCELERATOR).build(); this.energyCell = registry.block("energy_cell", EnergyCellBlock::new).features(AEFeature.ENERGY_CELLS) - .item(AEBaseBlockItemChargeable::new) - .tileEntity(registry.tileEntity("energy_cell", EnergyCellTileEntity.class, EnergyCellTileEntity::new).build()) + .item(AEBaseBlockItemChargeable::new).tileEntity(registry + .tileEntity("energy_cell", EnergyCellTileEntity.class, EnergyCellTileEntity::new).build()) .build(); this.energyCellDense = registry.block("dense_energy_cell", DenseEnergyCellBlock::new) .features(AEFeature.ENERGY_CELLS, AEFeature.DENSE_ENERGY_CELLS).item(AEBaseBlockItemChargeable::new) - .tileEntity(registry - .tileEntity("dense_energy_cell", DenseEnergyCellTileEntity.class, DenseEnergyCellTileEntity::new).build()) + .tileEntity(registry.tileEntity("dense_energy_cell", DenseEnergyCellTileEntity.class, + DenseEnergyCellTileEntity::new).build()) .build(); this.energyCellCreative = registry.block("creative_energy_cell", CreativeEnergyCellBlock::new) - .features(AEFeature.CREATIVE) - .tileEntity(registry - .tileEntity("creative_energy_cell", CreativeEnergyCellTileEntity.class, CreativeEnergyCellTileEntity::new) - .build()) + .features(AEFeature.CREATIVE).tileEntity(registry.tileEntity("creative_energy_cell", + CreativeEnergyCellTileEntity.class, CreativeEnergyCellTileEntity::new).build()) .build(); TileEntityDefinition craftingUnit = registry @@ -477,7 +492,8 @@ public final class ApiBlocks implements IBlocks { .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); TileEntityDefinition craftingStorage = registry - .tileEntity("crafting_storage", CraftingStorageTileEntity.class, CraftingStorageTileEntity::new).build(); + .tileEntity("crafting_storage", CraftingStorageTileEntity.class, CraftingStorageTileEntity::new) + .build(); this.craftingStorage1k = crafting .block("1k_crafting_storage", () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_1K)) @@ -533,7 +549,8 @@ public final class ApiBlocks implements IBlocks { } }) .tileEntity(registry - .tileEntity("molecular_assembler", MolecularAssemblerTileEntity.class, MolecularAssemblerTileEntity::new) + .tileEntity("molecular_assembler", MolecularAssemblerTileEntity.class, + MolecularAssemblerTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -545,8 +562,9 @@ public final class ApiBlocks implements IBlocks { this.lightDetector = registry.block("light_detector", LightDetectorBlock::new) .features(AEFeature.LIGHT_DETECTOR) - .tileEntity( - registry.tileEntity("light_detector", LightDetectorTileEntity.class, LightDetectorTileEntity::new).build()) + .tileEntity(registry + .tileEntity("light_detector", LightDetectorTileEntity.class, LightDetectorTileEntity::new) + .build()) .rendering(new BlockRenderingCustomizer() { @Override @OnlyIn(Dist.CLIENT) @@ -554,8 +572,9 @@ public final class ApiBlocks implements IBlocks { rendering.renderType(RenderType.getCutout()); } }).build(); - this.paint = registry.block("paint", PaintSplotchesBlock::new).features(AEFeature.PAINT_BALLS) - .tileEntity(registry.tileEntity("paint", PaintSplotchesTileEntity.class, PaintSplotchesTileEntity::new).build()) + this.paint = registry + .block("paint", PaintSplotchesBlock::new).features(AEFeature.PAINT_BALLS).tileEntity(registry + .tileEntity("paint", PaintSplotchesTileEntity.class, PaintSplotchesTileEntity::new).build()) .rendering(new PaintSplotchesRendering()).build(); this.skyStoneStairs = deco @@ -623,25 +642,32 @@ public final class ApiBlocks implements IBlocks { this.itemGen = registry.block("debug_item_gen", ItemGenBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) - .tileEntity(registry.tileEntity("debug_item_gen", ItemGenTileEntity.class, ItemGenTileEntity::new).build()).build(); + .tileEntity( + registry.tileEntity("debug_item_gen", ItemGenTileEntity.class, ItemGenTileEntity::new).build()) + .build(); this.chunkLoader = registry.block("debug_chunk_loader", ChunkLoaderBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) - .tileEntity( - registry.tileEntity("debug_chunk_loader", ChunkLoaderTileEntity.class, ChunkLoaderTileEntity::new).build()) + .tileEntity(registry + .tileEntity("debug_chunk_loader", ChunkLoaderTileEntity.class, ChunkLoaderTileEntity::new) + .build()) .build(); this.phantomNode = registry.block("debug_phantom_node", PhantomNodeBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) - .tileEntity( - registry.tileEntity("debug_phantom_node", PhantomNodeTileEntity.class, PhantomNodeTileEntity::new).build()) + .tileEntity(registry + .tileEntity("debug_phantom_node", PhantomNodeTileEntity.class, PhantomNodeTileEntity::new) + .build()) .build(); this.cubeGenerator = registry.block("debug_cube_gen", CubeGeneratorBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) - .tileEntity( - registry.tileEntity("debug_cube_gen", CubeGeneratorTileEntity.class, CubeGeneratorTileEntity::new).build()) + .tileEntity(registry + .tileEntity("debug_cube_gen", CubeGeneratorTileEntity.class, CubeGeneratorTileEntity::new) + .build()) .build(); this.energyGenerator = registry.block("debug_energy_gen", EnergyGeneratorBlock::new) - .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE).tileEntity(registry - .tileEntity("debug_energy_gen", EnergyGeneratorTileEntity.class, EnergyGeneratorTileEntity::new).build()) + .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) + .tileEntity(registry + .tileEntity("debug_energy_gen", EnergyGeneratorTileEntity.class, EnergyGeneratorTileEntity::new) + .build()) .build(); } diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 8b3c59b6b..d750a8962 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -59,17 +59,17 @@ import appeng.parts.misc.InvertedToggleBusPart; import appeng.parts.misc.StorageBusPart; import appeng.parts.misc.ToggleBusPart; import appeng.parts.networking.CoveredCablePart; -import appeng.parts.networking.GlassCablePart; -import appeng.parts.networking.SmartCablePart; import appeng.parts.networking.CoveredDenseCablePart; -import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.networking.GlassCablePart; import appeng.parts.networking.QuartzFiberPart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.SmartDenseCablePart; import appeng.parts.p2p.FEP2PTunnelPart; import appeng.parts.p2p.FluidP2PTunnelPart; import appeng.parts.p2p.ItemP2PTunnelPart; import appeng.parts.p2p.LightP2PTunnelPart; -import appeng.parts.p2p.RedstoneP2PTunnelPart; import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.p2p.RedstoneP2PTunnelPart; import appeng.parts.reporting.ConversionMonitorPart; import appeng.parts.reporting.CraftingTerminalPart; import appeng.parts.reporting.DarkPanelPart; @@ -186,11 +186,13 @@ public final class ApiParts implements IParts { this.p2PTunnelRedstone = createPart(registry, "redstone_p2p_tunnel", PartType.P2P_TUNNEL_REDSTONE, RedstoneP2PTunnelPart::new); this.p2PTunnelItems = createPart(registry, "item_p2p_tunnel", PartType.P2P_TUNNEL_ITEM, ItemP2PTunnelPart::new); - this.p2PTunnelFluids = createPart(registry, "fluid_p2p_tunnel", PartType.P2P_TUNNEL_FLUID, FluidP2PTunnelPart::new); + this.p2PTunnelFluids = createPart(registry, "fluid_p2p_tunnel", PartType.P2P_TUNNEL_FLUID, + FluidP2PTunnelPart::new); this.p2PTunnelEU = null; // FIXME createPart( "ic2_p2p_tunnel", PartType.P2P_TUNNEL_IC2, // PartP2PIC2Power::new); this.p2PTunnelFE = createPart(registry, "fe_p2p_tunnel", PartType.P2P_TUNNEL_FE, FEP2PTunnelPart::new); - this.p2PTunnelLight = createPart(registry, "light_p2p_tunnel", PartType.P2P_TUNNEL_LIGHT, LightP2PTunnelPart::new); + this.p2PTunnelLight = createPart(registry, "light_p2p_tunnel", PartType.P2P_TUNNEL_LIGHT, + LightP2PTunnelPart::new); this.interfaceTerminal = createPart(registry, "interface_terminal", PartType.INTERFACE_TERMINAL, InterfaceTerminalPart::new); this.fluidTerminal = createPart(registry, "fluid_terminal", PartType.FLUID_TERMINAL, FluidTerminalPart::new); diff --git a/src/main/java/appeng/core/sync/BasePacket.java b/src/main/java/appeng/core/sync/BasePacket.java index 74a7caf0a..f8f5172bd 100644 --- a/src/main/java/appeng/core/sync/BasePacket.java +++ b/src/main/java/appeng/core/sync/BasePacket.java @@ -40,7 +40,7 @@ public abstract class BasePacket { } public final int getPacketID() { - return PacketHandlerBase.PacketTypes.getID(this.getClass()).ordinal(); + return BasePacketHandler.PacketTypes.getID(this.getClass()).ordinal(); } public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { diff --git a/src/main/java/appeng/core/sync/PacketHandlerBase.java b/src/main/java/appeng/core/sync/BasePacketHandler.java similarity index 99% rename from src/main/java/appeng/core/sync/PacketHandlerBase.java rename to src/main/java/appeng/core/sync/BasePacketHandler.java index 58a3c7b22..fac85e3e5 100644 --- a/src/main/java/appeng/core/sync/PacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/BasePacketHandler.java @@ -22,10 +22,11 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import appeng.core.sync.packets.*; import net.minecraft.network.PacketBuffer; -public class PacketHandlerBase { +import appeng.core.sync.packets.*; + +public class BasePacketHandler { private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); public enum PacketTypes { diff --git a/src/main/java/appeng/core/sync/network/ClientPacketHandler.java b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java index dd3ea3996..60557ed74 100644 --- a/src/main/java/appeng/core/sync/network/ClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java @@ -25,9 +25,9 @@ import net.minecraft.network.PacketBuffer; import appeng.core.AELog; import appeng.core.sync.BasePacket; -import appeng.core.sync.PacketHandlerBase; +import appeng.core.sync.BasePacketHandler; -public class ClientPacketHandler extends PacketHandlerBase implements IPacketHandler { +public class ClientPacketHandler extends BasePacketHandler implements IPacketHandler { @Override public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketBuffer packet, diff --git a/src/main/java/appeng/core/sync/network/ServerPacketHandler.java b/src/main/java/appeng/core/sync/network/ServerPacketHandler.java index 082dd05a4..0ed6f6d6e 100644 --- a/src/main/java/appeng/core/sync/network/ServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ServerPacketHandler.java @@ -24,9 +24,9 @@ import net.minecraft.network.PacketBuffer; import appeng.core.AELog; import appeng.core.sync.BasePacket; -import appeng.core.sync.PacketHandlerBase; +import appeng.core.sync.BasePacketHandler; -public final class ServerPacketHandler extends PacketHandlerBase implements IPacketHandler { +public final class ServerPacketHandler extends BasePacketHandler implements IPacketHandler { @Override public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketBuffer packet, diff --git a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java index df82537c0..a75dbc5f0 100644 --- a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java +++ b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java @@ -61,7 +61,7 @@ public class BlockTransitionEffectPacket extends BasePacket { } public BlockTransitionEffectPacket(BlockPos pos, BlockState blockState, AEPartLocation direction, - SoundMode soundMode) { + SoundMode soundMode) { this.pos = pos; this.blockState = blockState; this.direction = direction; diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java index f99f9ed1e..1e3fa6d9f 100644 --- a/src/main/java/appeng/core/sync/packets/ClickPacket.java +++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java @@ -86,12 +86,12 @@ public class ClickPacket extends BasePacket { } private ClickPacket(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, - final Hand hand) { + final Hand hand) { this(pos, side, hitX, hitY, hitZ, hand, false); } public ClickPacket(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, - final Hand hand, boolean leftClick) { + final Hand hand, boolean leftClick) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); diff --git a/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java index 40b809da0..519f63219 100644 --- a/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java +++ b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java @@ -48,7 +48,7 @@ public class CompassResponsePacket extends BasePacket { // api public CompassResponsePacket(final CompassRequestPacket req, final boolean hasResult, final boolean spin, - final double radians) { + final double radians) { final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java index 545c49239..1d7fb2ffc 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java @@ -18,8 +18,6 @@ package appeng.core.sync.packets; -import appeng.client.gui.implementations.CraftingCPUScreen; -import appeng.core.sync.BasePacket; import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; @@ -34,6 +32,7 @@ import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; +import appeng.client.gui.implementations.CraftingCPUScreen; import appeng.container.AEBaseContainer; import appeng.container.implementations.CellWorkbenchContainer; import appeng.container.implementations.CraftConfirmContainer; @@ -46,6 +45,7 @@ import appeng.container.implementations.PriorityContainer; import appeng.container.implementations.QuartzKnifeContainer; import appeng.container.implementations.SecurityStationContainer; import appeng.container.implementations.StorageBusContainer; +import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.fluids.container.FluidLevelEmitterContainer; import appeng.fluids.container.FluidStorageBusContainer; diff --git a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java index ec6a7b690..12a449021 100644 --- a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java +++ b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java @@ -52,7 +52,7 @@ public class MatterCannonPacket extends BasePacket { // api public MatterCannonPacket(final double x, final double y, final double z, final float dx, final float dy, - final float dz, final byte len) { + final float dz, final byte len) { final float dl = dx * dx + dy * dy + dz * dz; final float dlz = (float) Math.sqrt(dl); diff --git a/src/main/java/appeng/entity/AEBaseItemEntity.java b/src/main/java/appeng/entity/AEBaseItemEntity.java index 86d954390..12a733448 100644 --- a/src/main/java/appeng/entity/AEBaseItemEntity.java +++ b/src/main/java/appeng/entity/AEBaseItemEntity.java @@ -36,7 +36,7 @@ public abstract class AEBaseItemEntity extends ItemEntity { } protected AEBaseItemEntity(EntityType entityType, final World world, final double x, - final double y, final double z, final ItemStack stack) { + final double y, final double z, final ItemStack stack) { this(entityType, world); this.setPosition(x, y, z); this.rotationYaw = this.rand.nextFloat() * 360.0F; diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index dcf720dbf..2e97668d3 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -58,7 +58,7 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit } public TinyTNTPrimedEntity(final World w, final double x, final double y, final double z, - final LivingEntity igniter) { + final LivingEntity igniter) { super(w, x, y, z, igniter); } diff --git a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java index 81115d2b4..83b994939 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java @@ -43,7 +43,7 @@ public class TinyTNTPrimedRenderer extends EntityRenderer { @Override public void render(TinyTNTPrimedEntity tnt, float entityYaw, float partialTicks, MatrixStack mStack, - IRenderTypeBuffer buffers, int packedLight) { + IRenderTypeBuffer buffers, int packedLight) { final BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher(); mStack.push(); mStack.translate(0, 0.25F, 0); diff --git a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java index 030701225..6d0f84673 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java @@ -17,7 +17,7 @@ import appeng.fluids.util.IAEFluidTank; public class FluidFormationPlaneScreen extends UpgradeableScreen { public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory, - ITextComponent title) { + ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } diff --git a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java index 9120e7f46..c89be4b8d 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java @@ -35,7 +35,8 @@ import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.util.IAEFluidTank; public class FluidInterfaceScreen extends UpgradeableScreen { - public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory, ITextComponent title) { + public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.ySize = 231; } @@ -54,8 +55,8 @@ public class FluidInterfaceScreen extends UpgradeableScreen openPriorityGui())); + this.addButton(new TabButton(this.getGuiLeft() + 154, this.getGuiTop(), 2 + 4 * 16, GuiText.Priority.getLocal(), + this.itemRenderer, btn -> openPriorityGui())); } @Override diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index a69b8aa8a..c3625fd3a 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -22,7 +22,7 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen storageFilter; public FluidStorageBusScreen(FluidStorageBusContainer container, PlayerInventory playerInventory, - ITextComponent title) { + ITextComponent title) { super(container, playerInventory, title); this.ySize = 251; } @@ -88,8 +88,8 @@ public class FluidStorageBusScreen extends UpgradeableScreen(this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - addButton(this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, - GuiText.Priority.getLocal(), this.itemRenderer, btn -> openPriorityGui()))); + addButton(this.addButton(new TabButton(this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), + this.itemRenderer, btn -> openPriorityGui()))); this.addButton(this.storageFilter); this.addButton(this.fuzzyMode); diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java index a2a61d7d6..2535eb054 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java @@ -41,10 +41,10 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.util.IConfigManager; import appeng.client.ActionKey; import appeng.client.gui.AEBaseMEScreen; +import appeng.client.gui.widgets.AETextField; +import appeng.client.gui.widgets.ISortSource; import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.SettingToggleButton; -import appeng.client.gui.widgets.ISortSource; -import appeng.client.gui.widgets.AETextField; import appeng.client.me.FluidRepo; import appeng.client.me.InternalFluidSlotME; import appeng.client.me.SlotFluidME; @@ -52,8 +52,8 @@ import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.InventoryActionPacket; import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.InventoryActionPacket; import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.container.slots.IMEFluidSlot; import appeng.helpers.InventoryAction; @@ -65,7 +65,8 @@ import appeng.util.Platform; * @version rv6 - 12/05/2018 * @since rv6 12/05/2018 */ -public class FluidTerminalScreen extends AEBaseMEScreen implements ISortSource, IConfigManagerHost { +public class FluidTerminalScreen extends AEBaseMEScreen + implements ISortSource, IConfigManagerHost { private final List meFluidSlots = new LinkedList<>(); private final FluidRepo repo; private final IConfigManager configSrc; @@ -79,7 +80,8 @@ public class FluidTerminalScreen extends AEBaseMEScreen private SettingToggleButton sortByBox; private SettingToggleButton sortDirBox; - public FluidTerminalScreen(FluidTerminalContainer container, PlayerInventory playerInventory, ITextComponent title) { + public FluidTerminalScreen(FluidTerminalContainer container, PlayerInventory playerInventory, + ITextComponent title) { super(container, playerInventory, title); this.xSize = 185; this.ySize = 222; @@ -108,8 +110,8 @@ public class FluidTerminalScreen extends AEBaseMEScreen getSortBy(), Platform::isSortOrderAvailable, this::toggleServerSetting)); offset += 20; - this.sortDirBox = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, - Settings.SORT_DIRECTION, getSortDir(), this::toggleServerSetting)); + this.sortDirBox = this.addButton(new SettingToggleButton<>(this.guiLeft - 18, offset, Settings.SORT_DIRECTION, + getSortDir(), this::toggleServerSetting)); for (int y = 0; y < ROWS; y++) { for (int x = 0; x < COLS; x++) { diff --git a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java index 17413298d..882bc8251 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java @@ -16,7 +16,7 @@ public class OptionalFluidSlotWidget extends FluidSlotWidget { private final int srcY; public OptionalFluidSlotWidget(IAEFluidTank fluids, final IOptionalSlotHost containerBus, int slot, int id, - int groupNum, int x, int y, int xoffs, int yoffs) { + int groupNum, int x, int y, int xoffs, int yoffs) { super(fluids, slot, id, x + xoffs * 18, y + yoffs * 18); this.containerBus = containerBus; this.groupNum = groupNum; diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java index e73f0cd1b..d4eebaed4 100644 --- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java +++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java @@ -67,9 +67,9 @@ import appeng.container.guisync.GuiSync; import appeng.container.implementations.ContainerHelper; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.MEFluidInventoryUpdatePacket; import appeng.core.sync.packets.TargetFluidStackPacket; -import appeng.core.sync.packets.ConfigValuePacket; import appeng.fluids.util.AEFluidStack; import appeng.helpers.InventoryAction; import appeng.me.helpers.ChannelPowerSrc; diff --git a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java index 1be699478..9ff0640b7 100644 --- a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java +++ b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java @@ -51,7 +51,8 @@ import appeng.fluids.helper.IFluidInterfaceHost; import appeng.helpers.IPriorityHost; import appeng.tile.grid.AENetworkTileEntity; -public class FluidInterfaceTileEntity extends AENetworkTileEntity implements IGridTickable, IFluidInterfaceHost, IPriorityHost { +public class FluidInterfaceTileEntity extends AENetworkTileEntity + implements IGridTickable, IFluidInterfaceHost, IPriorityHost { private final DualityFluidInterface duality = new DualityFluidInterface(this.getProxy(), this); public FluidInterfaceTileEntity(TileEntityType tileEntityTypeIn) { diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java index ee1347871..316fcf017 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java @@ -35,8 +35,8 @@ import appeng.tile.misc.ChargerTileEntity; public class ChargerInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, + World world, BlockState blockState, IProbeHitData data) { if (tile instanceof ChargerTileEntity) { final ChargerTileEntity charger = (ChargerTileEntity) tile; final IItemHandler chargerInventory = charger.getInternalInventory(); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java index d7b2666f5..d2b20af22 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java @@ -36,8 +36,8 @@ import appeng.tile.crafting.CraftingMonitorTileEntity; public class CraftingMonitorInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, + World world, BlockState blockState, IProbeHitData data) { if (tile instanceof CraftingMonitorTileEntity) { final CraftingMonitorTileEntity monitor = (CraftingMonitorTileEntity) tile; final IAEItemStack displayStack = monitor.getJobProgress(); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java index 382340e87..83dae3a46 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java @@ -41,5 +41,5 @@ public interface ITileProbInfoProvider { * World, IBlockState, IProbeHitData) */ void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data); + BlockState blockState, IProbeHitData data); } diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java index b93e9c1b7..a50cdf4fc 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java @@ -33,8 +33,8 @@ import appeng.tile.AEBaseTileEntity; public class PowerStateInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, + World world, BlockState blockState, IProbeHitData data) { if (tile instanceof IPowerChannelState) { final IPowerChannelState state = (IPowerChannelState) tile; diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java index 835bd5869..b34790d86 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java @@ -34,8 +34,8 @@ import appeng.util.Platform; public class PowerStorageInfoProvider implements ITileProbInfoProvider { @Override - public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, - BlockState blockState, IProbeHitData data) { + public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, + World world, BlockState blockState, IProbeHitData data) { if (tile instanceof IAEPowerStorage) { final IAEPowerStorage storage = (IAEPowerStorage) tile; final double maxPower = storage.getAEMaxPower(); diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index f8ec2b412..12ca93c3e 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -47,17 +47,17 @@ import appeng.parts.misc.InvertedToggleBusPart; import appeng.parts.misc.StorageBusPart; import appeng.parts.misc.ToggleBusPart; import appeng.parts.networking.CoveredCablePart; -import appeng.parts.networking.GlassCablePart; -import appeng.parts.networking.SmartCablePart; import appeng.parts.networking.CoveredDenseCablePart; -import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.networking.GlassCablePart; import appeng.parts.networking.QuartzFiberPart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.SmartDenseCablePart; import appeng.parts.p2p.FEP2PTunnelPart; import appeng.parts.p2p.FluidP2PTunnelPart; import appeng.parts.p2p.ItemP2PTunnelPart; import appeng.parts.p2p.LightP2PTunnelPart; -import appeng.parts.p2p.RedstoneP2PTunnelPart; import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.p2p.RedstoneP2PTunnelPart; import appeng.parts.reporting.ConversionMonitorPart; import appeng.parts.reporting.CraftingTerminalPart; import appeng.parts.reporting.DarkPanelPart; diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index 7c1b7408a..100270340 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -36,8 +36,8 @@ import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.ticking.ITickManager; import appeng.core.AELog; import appeng.me.cache.helpers.TunnelCollection; -import appeng.parts.p2p.P2PTunnelPart; import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.p2p.P2PTunnelPart; public class P2PCache implements IGridCache { private static final TunnelCollection NULL_COLLECTION = new TunnelCollection(null, diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java index f56bc439e..9701b542a 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java @@ -68,7 +68,7 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer { @Override public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, - int combinedLightIn, int combinedOverlayIn) { + int combinedLightIn, int combinedOverlayIn) { if (!te.getCableBus().isRequiresDynamicRender()) { return; } diff --git a/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java index c110dab26..6d89ee440 100644 --- a/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java +++ b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java @@ -41,7 +41,8 @@ import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.capabilities.Capabilities; import appeng.tile.AEBaseInvTileEntity; -public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity implements IAEPowerStorage, IExternalPowerSink { +public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity + implements IAEPowerStorage, IExternalPowerSink { // values that determine general function, are set by inheriting classes if // needed. These should generally remain static. diff --git a/src/main/java/appeng/tile/storage/ChestTileEntity.java b/src/main/java/appeng/tile/storage/ChestTileEntity.java index 6cb2b8b92..98c5cd1a8 100644 --- a/src/main/java/appeng/tile/storage/ChestTileEntity.java +++ b/src/main/java/appeng/tile/storage/ChestTileEntity.java @@ -588,7 +588,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity @Override public boolean isValid(final Object verificationToken) { ChestTileEntity.this.updateHandler(); - if (ChestTileEntity.this.cellHandler != null && this.chan == ChestTileEntity.this.cellHandler.getChannel()) { + if (ChestTileEntity.this.cellHandler != null + && this.chan == ChestTileEntity.this.cellHandler.getChannel()) { return verificationToken == ChestTileEntity.this.cellHandler; } return false; @@ -704,8 +705,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity private class FluidHandler implements IFluidHandler, IFluidTank { private boolean canAcceptLiquids() { - return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi.instance() - .storage().getStorageChannel(IFluidStorageChannel.class); + return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi + .instance().storage().getStorageChannel(IFluidStorageChannel.class); } @Nonnull @@ -754,8 +755,9 @@ public class ChestTileEntity extends AENetworkPowerTileEntity public int fill(FluidStack resource, FluidAction action) { ChestTileEntity.this.updateHandler(); if (canAcceptLiquids()) { - final IAEFluidStack results = Platform.poweredInsert(ChestTileEntity.this, ChestTileEntity.this.cellHandler, - AEFluidStack.fromFluidStack(resource), ChestTileEntity.this.mySrc, + final IAEFluidStack results = Platform.poweredInsert(ChestTileEntity.this, + ChestTileEntity.this.cellHandler, AEFluidStack.fromFluidStack(resource), + ChestTileEntity.this.mySrc, action == FluidAction.EXECUTE ? Actionable.MODULATE : Actionable.SIMULATE); if (results == null) { @@ -789,8 +791,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { if (ChestTileEntity.this.isPowered()) { ChestTileEntity.this.updateHandler(); - return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi.instance() - .storage().getStorageChannel(IItemStorageChannel.class); + return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler + .getChannel() == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class); } return false; } diff --git a/src/main/java/appeng/tile/storage/IOPortTileEntity.java b/src/main/java/appeng/tile/storage/IOPortTileEntity.java index 0e4236fb7..339420d8f 100644 --- a/src/main/java/appeng/tile/storage/IOPortTileEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortTileEntity.java @@ -22,7 +22,6 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import appeng.tile.grid.AENetworkInvTileEntity; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -62,6 +61,7 @@ import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; import appeng.parts.automation.BlockUpgradeInventory; import appeng.parts.automation.UpgradeInventory; +import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -74,7 +74,8 @@ import appeng.util.inv.WrapperChainedItemHandler; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.AEItemFilters; -public class IOPortTileEntity extends AENetworkInvTileEntity implements IUpgradeableHost, IConfigManagerHost, IGridTickable { +public class IOPortTileEntity extends AENetworkInvTileEntity + implements IUpgradeableHost, IConfigManagerHost, IGridTickable { private static final int NUMBER_OF_CELL_SLOTS = 6; private static final int NUMBER_OF_UPGRADE_SLOTS = 3;