From b72a3aa4dac476dbd12eabd94952b0e7340e6993 Mon Sep 17 00:00:00 2001 From: yueh Date: Tue, 11 May 2021 11:31:06 +0200 Subject: [PATCH] Updated Forge and dependencies (#5208) Updated Forge to the latest RB 36.1.0. Updated JEI to the 1.16.5 builds instead of 1.16.4 Updated TOP to 3.0.8 Updated mappings to 20210309-1.16.5 Updated spotless to 5.12.4 --- build.gradle | 6 +++++- codeformat/copyright.txt | 2 +- gradle.properties | 12 ++++++------ src/api/java/appeng/api/IAppEngApi.java | 2 +- .../appeng/api/config/AccessRestriction.java | 2 +- .../java/appeng/api/config/ActionItems.java | 2 +- .../appeng/api/config/CondenserOutput.java | 2 +- .../java/appeng/api/config/FullnessMode.java | 2 +- src/api/java/appeng/api/config/FuzzyMode.java | 2 +- .../java/appeng/api/config/IncludeExclude.java | 2 +- .../appeng/api/config/LevelEmitterMode.java | 2 +- src/api/java/appeng/api/config/LevelType.java | 2 +- .../appeng/api/config/NetworkEmitterMode.java | 2 +- .../java/appeng/api/config/OperationMode.java | 2 +- src/api/java/appeng/api/config/PowerUnits.java | 2 +- .../java/appeng/api/config/RedstoneMode.java | 2 +- .../appeng/api/config/RelativeDirection.java | 2 +- src/api/java/appeng/api/config/SortDir.java | 2 +- src/api/java/appeng/api/config/SortOrder.java | 2 +- .../java/appeng/api/config/TerminalStyle.java | 2 +- src/api/java/appeng/api/config/ViewItems.java | 2 +- .../api/features/IItemComparisonProvider.java | 2 +- .../java/appeng/api/features/ILocatable.java | 2 +- .../api/features/ILocatableRegistry.java | 2 +- .../api/features/IP2PTunnelRegistry.java | 2 +- .../api/features/IWirelessTermHandler.java | 2 +- .../items/IAEItemPowerStorage.java | 2 +- .../items/ISpatialStorageCell.java | 2 +- .../parts/IStorageMonitorPart.java | 2 +- .../appeng/api/movable/IMovableHandler.java | 2 +- .../appeng/api/movable/IMovableRegistry.java | 2 +- src/api/java/appeng/api/networking/IGrid.java | 2 +- .../appeng/api/networking/IGridConnection.java | 2 +- .../appeng/api/networking/IGridHelper.java | 2 +- .../events/statistics/MENetworkChunkEvent.java | 2 +- .../api/networking/pathing/IPathingGrid.java | 2 +- .../api/networking/security/IActionSource.java | 2 +- src/api/java/appeng/api/parts/IFacadePart.java | 2 +- src/api/java/appeng/api/parts/IPartHost.java | 2 +- src/api/java/appeng/api/parts/IPartItem.java | 2 +- .../java/appeng/api/storage/ICellRegistry.java | 2 +- .../appeng/api/storage/cells/CellState.java | 2 +- .../appeng/api/storage/cells/ICellHandler.java | 2 +- .../appeng/api/storage/data/IAEItemStack.java | 2 +- .../api/storage/data/IItemContainer.java | 2 +- .../appeng/api/storage/data/IItemList.java | 2 +- src/api/java/appeng/api/util/ICommonTile.java | 2 +- src/api/java/appeng/api/util/IOrientable.java | 2 +- .../java/appeng/api/util/IOrientableBlock.java | 2 +- .../block/AEBaseBlockItemChargeable.java | 2 +- .../java/appeng/block/misc/TinyTNTBlock.java | 2 +- src/main/java/appeng/client/ClientHelper.java | 2 +- .../java/appeng/client/gui/AEBaseScreen.java | 2 +- src/main/java/appeng/client/gui/Tooltip.java | 2 +- .../appeng/client/gui/WidgetContainer.java | 5 ++--- .../implementations/CellWorkbenchScreen.java | 2 -- .../gui/implementations/UpgradeableScreen.java | 1 - .../gui/me/common/MEMonitorableScreen.java | 3 +-- .../gui/me/crafting/AbstractTableRenderer.java | 2 +- .../InterfaceTerminalScreen.java | 2 +- .../appeng/client/gui/widgets/AETextField.java | 4 ++-- .../client/gui/widgets/CustomSlotWidget.java | 4 ---- .../appeng/client/gui/widgets/ITooltip.java | 6 ------ .../appeng/client/gui/widgets/IconButton.java | 2 +- .../appeng/client/gui/widgets/ProgressBar.java | 4 ++-- .../appeng/client/gui/widgets/TabButton.java | 2 +- .../client/gui/widgets/ToggleButton.java | 2 +- .../client/gui/widgets/VerticalButtonBar.java | 2 +- .../render/overlay/OverlayRenderType.java | 8 ++++---- .../appeng/client/render/tesr/ModularTESR.java | 2 +- .../CellWorkbenchContainer.java | 2 +- .../implementations/IOBusContainer.java | 1 - .../implementations/PriorityContainer.java | 2 -- .../container/slot/RestrictedInputSlot.java | 6 ------ src/main/java/appeng/core/CreativeTab.java | 2 +- src/main/java/appeng/core/Registration.java | 2 +- .../java/appeng/core/api/ApiClientHelper.java | 14 +++++++------- .../java/appeng/core/localization/GuiText.java | 2 +- .../core/sync/packets/ConfigValuePacket.java | 1 - .../packets/ItemTransitionEffectPacket.java | 1 - .../appeng/entity/TinyTNTPrimedEntity.java | 2 +- .../client/gui/widgets/FluidSlotWidget.java | 1 - .../client/gui/widgets/FluidTankWidget.java | 2 +- .../appeng/helpers/InvalidPatternHelper.java | 3 ++- .../java/appeng/hooks/ticking/PlayerColor.java | 2 +- .../appeng/hooks/ticking/ServerTileRepo.java | 2 +- src/main/java/appeng/items/AEBaseItem.java | 2 -- .../java/appeng/items/contents/CellConfig.java | 2 +- .../appeng/items/contents/CellUpgrades.java | 2 +- .../appeng/items/misc/EncodedPatternItem.java | 18 ++++++++++-------- .../java/appeng/items/parts/FacadeItem.java | 2 +- .../appeng/items/tools/BiometricCardItem.java | 2 +- .../appeng/items/tools/NetworkToolItem.java | 3 --- .../tools/powered/ColorApplicatorItem.java | 2 +- .../powered/powersink/AEBasePoweredItem.java | 2 +- .../items/tools/quartz/QuartzHoeItem.java | 2 +- .../me/cache/helpers/ConnectionWrapper.java | 2 +- .../me/cache/helpers/TunnelConnection.java | 2 +- .../implementations/CraftingCPUCluster.java | 2 +- .../parts/misc/SharedStorageBusPart.java | 2 +- .../appeng/recipes/entropy/EntropyMode.java | 2 +- .../recipes/entropy/MultipleValuesMatcher.java | 2 +- .../recipes/entropy/RangeValueMatcher.java | 2 +- .../recipes/entropy/SingleValueMatcher.java | 2 +- .../appeng/recipes/game/DisassembleRecipe.java | 2 +- .../java/appeng/recipes/game/FacadeRecipe.java | 2 +- .../subcommands/SpatialStorageCommand.java | 7 ++++--- .../subcommands/TestMeteoritesCommand.java | 2 +- .../appeng/spatial/SpatialStorageBiome.java | 2 +- .../spatial/SpatialStorageWorldData.java | 2 +- .../worldgen/meteorite/MeteoriteStructure.java | 4 ++-- .../meteorite/MeteoriteStructureStart.java | 2 +- .../meteorite/fallout/FalloutCopy.java | 2 +- .../meteorite/fallout/FalloutSand.java | 2 +- .../meteorite/fallout/FalloutSnow.java | 2 +- src/main/java/team/chisel/ctm/api/IFacade.java | 6 +++--- .../appeng/client/gui/MockResourceManager.java | 4 +++- .../client/gui/ScreenRegistrationTest.java | 2 +- .../java/appeng/client/gui/TooltipTest.java | 2 +- .../appeng/client/gui/style/ColorTest.java | 2 +- .../client/gui/style/StyleManagerTest.java | 2 +- src/test/java/appeng/util/EnumCyclerTest.java | 2 +- .../util/item/AESharedItemStackTest.java | 2 +- .../java/appeng/util/item/ItemListTest.java | 7 +++++-- 124 files changed, 155 insertions(+), 174 deletions(-) diff --git a/build.gradle b/build.gradle index ca55d2e6a11..e8451ba9697 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ buildscript { plugins { id "maven-publish" - id "com.diffplug.gradle.spotless" version "4.3.0" + id "com.diffplug.spotless" version "5.12.4" id "com.matthewprenger.cursegradle" version "1.4.0" id "idea" } @@ -339,13 +339,17 @@ publishing { ///////////// // Spotless spotless { + java { target 'src/*/java/appeng/**/*.java' + endWithNewline() indentWithSpaces() + removeUnusedImports() eclipse().configFile 'codeformat/codeformat.xml' importOrderFile 'codeformat/ae2.importorder' } + format 'json', { target 'src/*/resources/**/*.json' targetExclude 'src/generated/resources/**' diff --git a/codeformat/copyright.txt b/codeformat/copyright.txt index dda9d160cff..226e96e9ce9 100644 --- a/codeformat/copyright.txt +++ b/codeformat/copyright.txt @@ -1,5 +1,5 @@ This file is part of Applied Energistics 2. -Copyright (c) 2013 - $YEAR, AlgorithmX2, All rights reserved. +Copyright (c) $YEAR, TeamAppliedEnergistics, All rights reserved. Applied Energistics 2 is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/gradle.properties b/gradle.properties index b52bec2af9c..d1c9edc31b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,16 +12,16 @@ minecraft_release=1.16 minecraft_version=1.16.5 minecraft_version_range=[1.16.5,1.17.0) mcp_channel=snapshot -mcp_mappings=20201028-1.16.3 -forge_version=36.0.42 -forge_version_range=[36.0.21,37.0.0) +mcp_mappings=20210309-1.16.5 +forge_version=36.1.0 +forge_version_range=[36.1.0,37.0.0) ######################################################### # Provided APIs # ######################################################### -jei_minecraft_version=1.16.4 -jei_version=7.6.1.71 -top_version=3.0.6-8 +jei_minecraft_version=1.16.5 +jei_version=7.6.4.90 +top_version=3.0.8-14 ######################################################### # Deployment # diff --git a/src/api/java/appeng/api/IAppEngApi.java b/src/api/java/appeng/api/IAppEngApi.java index 6a3391f8c3e..7c3c02daedb 100644 --- a/src/api/java/appeng/api/IAppEngApi.java +++ b/src/api/java/appeng/api/IAppEngApi.java @@ -69,4 +69,4 @@ public interface IAppEngApi { */ IClientHelper client(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/AccessRestriction.java b/src/api/java/appeng/api/config/AccessRestriction.java index 6a4fab333e9..4f05d482f7e 100644 --- a/src/api/java/appeng/api/config/AccessRestriction.java +++ b/src/api/java/appeng/api/config/AccessRestriction.java @@ -61,4 +61,4 @@ public AccessRestriction addPermissions(final AccessRestriction ar) { public AccessRestriction removePermissions(final AccessRestriction ar) { return this.getPermByBit(this.permissionBit & (~ar.permissionBit)); } -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/ActionItems.java b/src/api/java/appeng/api/config/ActionItems.java index 5d1c81d75a0..16f6bf68697 100644 --- a/src/api/java/appeng/api/config/ActionItems.java +++ b/src/api/java/appeng/api/config/ActionItems.java @@ -25,4 +25,4 @@ public enum ActionItems { WRENCH, CLOSE, STASH, ENCODE, ENABLE_SUBSTITUTION, DISABLE_SUBSTITUTION -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/CondenserOutput.java b/src/api/java/appeng/api/config/CondenserOutput.java index 328877987e1..17eab971f3b 100644 --- a/src/api/java/appeng/api/config/CondenserOutput.java +++ b/src/api/java/appeng/api/config/CondenserOutput.java @@ -33,4 +33,4 @@ public enum CondenserOutput { public int requiredPower = 0; -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/FullnessMode.java b/src/api/java/appeng/api/config/FullnessMode.java index 4b213cc723c..f3332036ca8 100644 --- a/src/api/java/appeng/api/config/FullnessMode.java +++ b/src/api/java/appeng/api/config/FullnessMode.java @@ -25,4 +25,4 @@ public enum FullnessMode { EMPTY, HALF, FULL -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java index ec9ad12d261..63ebaee15e1 100644 --- a/src/api/java/appeng/api/config/FuzzyMode.java +++ b/src/api/java/appeng/api/config/FuzzyMode.java @@ -65,4 +65,4 @@ public int calculateBreakPoint(final int maxDamage) { return (int) ((this.percentage * maxDamage) / 100.0f); } -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/IncludeExclude.java b/src/api/java/appeng/api/config/IncludeExclude.java index 64a4a8e8795..14015a29396 100644 --- a/src/api/java/appeng/api/config/IncludeExclude.java +++ b/src/api/java/appeng/api/config/IncludeExclude.java @@ -25,4 +25,4 @@ public enum IncludeExclude { WHITELIST, BLACKLIST -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/LevelEmitterMode.java b/src/api/java/appeng/api/config/LevelEmitterMode.java index 352c966f425..ab2c407a5f7 100644 --- a/src/api/java/appeng/api/config/LevelEmitterMode.java +++ b/src/api/java/appeng/api/config/LevelEmitterMode.java @@ -29,4 +29,4 @@ public enum LevelEmitterMode { STORABLE_AMOUNT -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/LevelType.java b/src/api/java/appeng/api/config/LevelType.java index 86acc0e8bbb..a880f7aa44d 100644 --- a/src/api/java/appeng/api/config/LevelType.java +++ b/src/api/java/appeng/api/config/LevelType.java @@ -29,4 +29,4 @@ public enum LevelType { ENERGY_LEVEL -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/NetworkEmitterMode.java b/src/api/java/appeng/api/config/NetworkEmitterMode.java index 022cb0339cc..c0b1b3a569f 100644 --- a/src/api/java/appeng/api/config/NetworkEmitterMode.java +++ b/src/api/java/appeng/api/config/NetworkEmitterMode.java @@ -31,4 +31,4 @@ public enum NetworkEmitterMode { CHANNEL_ERROR -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/OperationMode.java b/src/api/java/appeng/api/config/OperationMode.java index b5016b0ac62..4541b47607c 100644 --- a/src/api/java/appeng/api/config/OperationMode.java +++ b/src/api/java/appeng/api/config/OperationMode.java @@ -25,4 +25,4 @@ public enum OperationMode { FILL, EMPTY -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java index 4bc09871be7..d03fb355c0f 100644 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ b/src/api/java/appeng/api/config/PowerUnits.java @@ -64,4 +64,4 @@ public ITextComponent textComponent() { return new TranslationTextComponent(unlocalizedName); } -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/RedstoneMode.java b/src/api/java/appeng/api/config/RedstoneMode.java index 6fcec573d54..fc05205868f 100644 --- a/src/api/java/appeng/api/config/RedstoneMode.java +++ b/src/api/java/appeng/api/config/RedstoneMode.java @@ -25,4 +25,4 @@ public enum RedstoneMode { IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/RelativeDirection.java b/src/api/java/appeng/api/config/RelativeDirection.java index e80bc5eeac5..72ff7218eda 100644 --- a/src/api/java/appeng/api/config/RelativeDirection.java +++ b/src/api/java/appeng/api/config/RelativeDirection.java @@ -25,4 +25,4 @@ public enum RelativeDirection { LEFT, RIGHT, UP, DOW -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/SortDir.java b/src/api/java/appeng/api/config/SortDir.java index 54b41285f03..70a4187dbd5 100644 --- a/src/api/java/appeng/api/config/SortDir.java +++ b/src/api/java/appeng/api/config/SortDir.java @@ -25,4 +25,4 @@ public enum SortDir { ASCENDING, DESCENDING -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/SortOrder.java b/src/api/java/appeng/api/config/SortOrder.java index a2f5c342988..069798e26f9 100644 --- a/src/api/java/appeng/api/config/SortOrder.java +++ b/src/api/java/appeng/api/config/SortOrder.java @@ -25,4 +25,4 @@ public enum SortOrder { NAME, AMOUNT, MOD -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/TerminalStyle.java b/src/api/java/appeng/api/config/TerminalStyle.java index 6197b382dca..fc90295debb 100644 --- a/src/api/java/appeng/api/config/TerminalStyle.java +++ b/src/api/java/appeng/api/config/TerminalStyle.java @@ -31,4 +31,4 @@ public enum TerminalStyle { SMALL -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/config/ViewItems.java b/src/api/java/appeng/api/config/ViewItems.java index ad418653236..160543652d6 100644 --- a/src/api/java/appeng/api/config/ViewItems.java +++ b/src/api/java/appeng/api/config/ViewItems.java @@ -25,4 +25,4 @@ public enum ViewItems { ALL, STORED, CRAFTABLE -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/features/IItemComparisonProvider.java b/src/api/java/appeng/api/features/IItemComparisonProvider.java index 8f83119241d..389e6e65be7 100644 --- a/src/api/java/appeng/api/features/IItemComparisonProvider.java +++ b/src/api/java/appeng/api/features/IItemComparisonProvider.java @@ -48,4 +48,4 @@ public interface IItemComparisonProvider { * @return true, if getComparison will return a valid IItemComparison Object */ boolean canHandle(ItemStack stack); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/features/ILocatable.java b/src/api/java/appeng/api/features/ILocatable.java index e8ef192df6d..cbc3f8a6120 100644 --- a/src/api/java/appeng/api/features/ILocatable.java +++ b/src/api/java/appeng/api/features/ILocatable.java @@ -37,4 +37,4 @@ public interface ILocatable { * @return the serial for a locatable object */ long getLocatableSerial(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/features/ILocatableRegistry.java b/src/api/java/appeng/api/features/ILocatableRegistry.java index f87f891d4bc..e1f2390e341 100644 --- a/src/api/java/appeng/api/features/ILocatableRegistry.java +++ b/src/api/java/appeng/api/features/ILocatableRegistry.java @@ -36,4 +36,4 @@ public interface ILocatableRegistry { * @return requestedObject, or null, if the object does not exist anymore */ ILocatable getLocatableBy(long serial); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index 9c6df1e1529..c5a4f07e1f0 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -57,4 +57,4 @@ public interface IP2PTunnelRegistry { */ @Nonnull TunnelType getTunnelTypeByItem(ItemStack trigger); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java index f5ceab755d9..a5166f9198e 100644 --- a/src/api/java/appeng/api/features/IWirelessTermHandler.java +++ b/src/api/java/appeng/api/features/IWirelessTermHandler.java @@ -68,4 +68,4 @@ public interface IWirelessTermHandler extends INetworkEncodable { * @return config manager of wireless terminal */ IConfigManager getConfigManager(ItemStack is); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java index 0b4a9d6fefd..2875071a78a 100644 --- a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java +++ b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java @@ -66,4 +66,4 @@ public interface IAEItemPowerStorage { */ AccessRestriction getPowerFlow(ItemStack stack); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index 62279b1f22a..b5b2ff84079 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -69,4 +69,4 @@ public interface ISpatialStorageCell { * @return success of transition */ boolean doSpatialTransition(ItemStack is, ServerWorld w, WorldCoord min, WorldCoord max, int playerId); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java b/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java index 8043ed87cf9..ffc14d117b6 100644 --- a/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java +++ b/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java @@ -44,4 +44,4 @@ public interface IStorageMonitorPart extends IMonitorPart, IPart, IGridHost, INe * @return the current locked state of the Storage Monitor */ boolean isLocked(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java index 8d40adb1fe1..30016f534d2 100644 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ b/src/api/java/appeng/api/movable/IMovableHandler.java @@ -64,4 +64,4 @@ public interface IMovableHandler { * @param newPosition the new location */ void moveTile(TileEntity tile, World world, BlockPos newPosition); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/movable/IMovableRegistry.java b/src/api/java/appeng/api/movable/IMovableRegistry.java index db62657dc82..141ce66ebbf 100644 --- a/src/api/java/appeng/api/movable/IMovableRegistry.java +++ b/src/api/java/appeng/api/movable/IMovableRegistry.java @@ -110,4 +110,4 @@ public interface IMovableRegistry { * @return true if this block is blacklisted */ boolean isBlacklisted(Block blk); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java index 2ab834fc58e..666ee0121e1 100644 --- a/src/api/java/appeng/api/networking/IGrid.java +++ b/src/api/java/appeng/api/networking/IGrid.java @@ -105,4 +105,4 @@ public interface IGrid { */ @Nonnull IGridNode getPivot(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/networking/IGridConnection.java b/src/api/java/appeng/api/networking/IGridConnection.java index d165c987a47..500e7616ca1 100644 --- a/src/api/java/appeng/api/networking/IGridConnection.java +++ b/src/api/java/appeng/api/networking/IGridConnection.java @@ -84,4 +84,4 @@ public interface IGridConnection { * @return how many channels pass over this connections. */ int getUsedChannels(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/networking/IGridHelper.java b/src/api/java/appeng/api/networking/IGridHelper.java index 35d24a66ef3..63675323142 100644 --- a/src/api/java/appeng/api/networking/IGridHelper.java +++ b/src/api/java/appeng/api/networking/IGridHelper.java @@ -62,4 +62,4 @@ public interface IGridHelper { @Nonnull IGridConnection createGridConnection(@Nonnull IGridNode a, @Nonnull IGridNode b) throws FailedConnectionException; -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/networking/events/statistics/MENetworkChunkEvent.java b/src/api/java/appeng/api/networking/events/statistics/MENetworkChunkEvent.java index 97328e8b8c5..a31d4dda9f9 100644 --- a/src/api/java/appeng/api/networking/events/statistics/MENetworkChunkEvent.java +++ b/src/api/java/appeng/api/networking/events/statistics/MENetworkChunkEvent.java @@ -71,4 +71,4 @@ public MENetworkChunkRemoved(ServerWorld world, ChunkPos chunkPos) { } -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java index c3cf16fd4d0..b6f292a85e7 100644 --- a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java +++ b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java @@ -44,4 +44,4 @@ public interface IPathingGrid extends IGridCache { * trigger a network reset, booting, path-finding and all. */ void repath(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/networking/security/IActionSource.java b/src/api/java/appeng/api/networking/security/IActionSource.java index e53a9496ace..34d04a40a59 100644 --- a/src/api/java/appeng/api/networking/security/IActionSource.java +++ b/src/api/java/appeng/api/networking/security/IActionSource.java @@ -71,4 +71,4 @@ public interface IActionSource { */ @Nonnull Optional context(@Nonnull Class key); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index 25b9d68b75a..8aabefbfe75 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -68,4 +68,4 @@ public interface IFacadePart { */ BlockState getBlockState(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index e243620e4a5..4527bfa18b8 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -188,4 +188,4 @@ public interface IPartHost extends ICustomCableConnection { */ boolean isInWorld(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java index 7186d0b9131..dd4d036a40e 100644 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ b/src/api/java/appeng/api/parts/IPartItem.java @@ -56,4 +56,4 @@ public interface IPartItem

{ */ P createPart(ItemStack is); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java index 9e6c84a2f95..951523343aa 100644 --- a/src/api/java/appeng/api/storage/ICellRegistry.java +++ b/src/api/java/appeng/api/storage/ICellRegistry.java @@ -102,4 +102,4 @@ public interface ICellRegistry { @Nullable > ICellInventoryHandler getCellInventory(ItemStack is, ISaveProvider host, IStorageChannel chan); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/storage/cells/CellState.java b/src/api/java/appeng/api/storage/cells/CellState.java index 65af6910108..b5dbe8ceb25 100644 --- a/src/api/java/appeng/api/storage/cells/CellState.java +++ b/src/api/java/appeng/api/storage/cells/CellState.java @@ -51,4 +51,4 @@ public enum CellState { * Full cell, technically could have free types */ FULL; -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/storage/cells/ICellHandler.java b/src/api/java/appeng/api/storage/cells/ICellHandler.java index 42664ba3354..29becafc14f 100644 --- a/src/api/java/appeng/api/storage/cells/ICellHandler.java +++ b/src/api/java/appeng/api/storage/cells/ICellHandler.java @@ -94,4 +94,4 @@ default > double cellIdleDrain(ItemStack is, ICellInventor } return 1.0; } -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/storage/data/IAEItemStack.java b/src/api/java/appeng/api/storage/data/IAEItemStack.java index 9980f89f5ea..6e0d9dd128f 100644 --- a/src/api/java/appeng/api/storage/data/IAEItemStack.java +++ b/src/api/java/appeng/api/storage/data/IAEItemStack.java @@ -113,4 +113,4 @@ public interface IAEItemStack extends IAEStack { */ boolean equals(ItemStack is); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/storage/data/IItemContainer.java b/src/api/java/appeng/api/storage/data/IItemContainer.java index 04b5ca18864..eff5e6fd361 100644 --- a/src/api/java/appeng/api/storage/data/IItemContainer.java +++ b/src/api/java/appeng/api/storage/data/IItemContainer.java @@ -61,4 +61,4 @@ public interface IItemContainer> { * @return true if there are no items in the list */ boolean isEmpty(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/storage/data/IItemList.java b/src/api/java/appeng/api/storage/data/IItemList.java index 93d610952a3..f3864dab2ea 100644 --- a/src/api/java/appeng/api/storage/data/IItemList.java +++ b/src/api/java/appeng/api/storage/data/IItemList.java @@ -81,4 +81,4 @@ public interface IItemList> extends IItemContainer, Ite * resets stack sizes to 0. */ void resetStatus(); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java index 33f17bfcde3..cdb6c254bd8 100644 --- a/src/api/java/appeng/api/util/ICommonTile.java +++ b/src/api/java/appeng/api/util/ICommonTile.java @@ -40,4 +40,4 @@ public interface ICommonTile { * @param drops drops of tile entity */ void getDrops(World world, BlockPos pos, List drops); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java index 111c49eba6b..947f03f5aef 100644 --- a/src/api/java/appeng/api/util/IOrientable.java +++ b/src/api/java/appeng/api/util/IOrientable.java @@ -56,4 +56,4 @@ public interface IOrientable { * @param Up new upwards direction */ void setOrientation(Direction Forward, Direction Up); -} \ No newline at end of file +} diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java index 61ab1ef2b0e..51c40ccfbad 100644 --- a/src/api/java/appeng/api/util/IOrientableBlock.java +++ b/src/api/java/appeng/api/util/IOrientableBlock.java @@ -38,4 +38,4 @@ public interface IOrientableBlock { * @return a IOrientable if applicable */ IOrientable getOrientable(IBlockReader world, BlockPos pos); -} \ No newline at end of file +} diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index dade7caec44..412769a7836 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -62,7 +62,7 @@ public void addCheckedInformation(final ItemStack stack, final World world, fina lines.add(GuiText.StoredEnergy.text().deepCopy() .appendString(':' + MessageFormat.format(" {0,number,#} ", internalCurrentPower)) - .append(new TranslationTextComponent(PowerUnits.AE.unlocalizedName)) + .appendSibling(new TranslationTextComponent(PowerUnits.AE.unlocalizedName)) .appendString(" - " + MessageFormat.format("{0,number,#.##%}", percent))); } } diff --git a/src/main/java/appeng/block/misc/TinyTNTBlock.java b/src/main/java/appeng/block/misc/TinyTNTBlock.java index b6fe6c7b11a..9d4a04c8015 100644 --- a/src/main/java/appeng/block/misc/TinyTNTBlock.java +++ b/src/main/java/appeng/block/misc/TinyTNTBlock.java @@ -116,7 +116,7 @@ public void onEntityWalk(final World w, final BlockPos pos, final Entity entity) if (entityarrow.isBurning()) { LivingEntity igniter = null; // Check if the shooter still exists - Entity shooter = entityarrow.func_234616_v_(); + Entity shooter = entityarrow.getShooter(); if (shooter instanceof LivingEntity) { igniter = (LivingEntity) shooter; } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 436b2caf783..33f365c054f 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -245,4 +245,4 @@ private void wheelEvent(final InputEvent.MouseScrollEvent me) { public boolean isActionKey(ActionKey key, InputMappings.Input pressedKey) { return this.bindings.get(key).isActiveAndMatches(pressedKey); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index ea4903b4af3..6a11baa6cfc 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -355,7 +355,7 @@ private void drawText(MatrixStack matrixStack, Text text, @Nullable TextOverride pos = pos.move(-textWidth / 2, 0); } - this.font.func_243248_b( + this.font.drawText( matrixStack, content, pos.getX(), diff --git a/src/main/java/appeng/client/gui/Tooltip.java b/src/main/java/appeng/client/gui/Tooltip.java index b7dbaf8d14e..e9a5448cdec 100644 --- a/src/main/java/appeng/client/gui/Tooltip.java +++ b/src/main/java/appeng/client/gui/Tooltip.java @@ -85,7 +85,7 @@ public Optional accept(Style style, String text) { String line = parts[i]; IFormattableTextComponent part = new StringTextComponent(line).setStyle(style); if (currentPart != null) { - currentPart = currentPart.append(part); + currentPart = currentPart.appendSibling(part); } else { currentPart = part; } diff --git a/src/main/java/appeng/client/gui/WidgetContainer.java b/src/main/java/appeng/client/gui/WidgetContainer.java index 6147b49fa2e..2984c867360 100644 --- a/src/main/java/appeng/client/gui/WidgetContainer.java +++ b/src/main/java/appeng/client/gui/WidgetContainer.java @@ -41,7 +41,6 @@ import appeng.client.gui.widgets.Scrollbar; import appeng.client.gui.widgets.TabButton; import appeng.container.implementations.PriorityContainer; -import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.SwitchGuisPacket; @@ -106,7 +105,7 @@ public Button addButton(String id, ITextComponent text, Button.IPressable action } public Button addButton(String id, ITextComponent text, Button.IPressable action) { - return addButton(id, text, action, Button.field_238486_s_); + return addButton(id, text, action, Button.EMPTY_TOOLTIP); } public Button addButton(String id, ITextComponent text, Runnable action, Button.ITooltip tooltip) { @@ -114,7 +113,7 @@ public Button addButton(String id, ITextComponent text, Runnable action, Button. } public Button addButton(String id, ITextComponent text, Runnable action) { - return addButton(id, text, action, Button.field_238486_s_); + return addButton(id, text, action, Button.EMPTY_TOOLTIP); } /** diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index c70750e5d97..6c18405107f 100644 --- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -22,7 +22,6 @@ import java.util.List; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.items.IItemHandler; @@ -32,7 +31,6 @@ import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; -import appeng.api.implementations.IUpgradeableHost; import appeng.api.implementations.items.IUpgradeModule; import appeng.client.gui.Icon; import appeng.client.gui.style.ScreenStyle; diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java index 070e0f3c4d0..6c86ef2c6ff 100644 --- a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java @@ -39,7 +39,6 @@ import appeng.container.SlotSemantic; import appeng.container.implementations.UpgradeableContainer; import appeng.core.localization.GuiText; -import appeng.tile.AEBaseTileEntity; /** * This screen adds the ability for {@link IUpgradeableHost} screens to show the upgrade inventory and the player's diff --git a/src/main/java/appeng/client/gui/me/common/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/me/common/MEMonitorableScreen.java index 907f4656197..6020e4a8302 100644 --- a/src/main/java/appeng/client/gui/me/common/MEMonitorableScreen.java +++ b/src/main/java/appeng/client/gui/me/common/MEMonitorableScreen.java @@ -42,7 +42,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; import appeng.api.config.SearchBoxMode; import appeng.api.config.Settings; @@ -291,7 +290,7 @@ public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY // The stack size renderer expects a 16x16 slot, while the button is normally // bigger int x = this.craftingStatusBtn.x + (this.craftingStatusBtn.getWidth() - 16) / 2; - int y = this.craftingStatusBtn.y + (this.craftingStatusBtn.getHeightRealms() - 16) / 2; + int y = this.craftingStatusBtn.y + (this.craftingStatusBtn.getHeight() - 16) / 2; style.getStackSizeRenderer().renderSizeLabel(font, x - this.guiLeft, y - this.guiTop, String.valueOf(container.activeCraftingJobs)); diff --git a/src/main/java/appeng/client/gui/me/crafting/AbstractTableRenderer.java b/src/main/java/appeng/client/gui/me/crafting/AbstractTableRenderer.java index 83491f174a8..7da6d6fba32 100644 --- a/src/main/java/appeng/client/gui/me/crafting/AbstractTableRenderer.java +++ b/src/main/java/appeng/client/gui/me/crafting/AbstractTableRenderer.java @@ -104,7 +104,7 @@ public final void render(MatrixStack matrixStack, int mouseX, int mouseY, List getTooltipMessage() { return Arrays.asList( result, new StringTextComponent(this.source.getCurrentProgress() + " ") - .append(GuiText.Of.text().deepCopy().appendString(" " + this.source.getMaxProgress()))); + .appendSibling(GuiText.Of.text().deepCopy().appendString(" " + this.source.getMaxProgress()))); } @Override diff --git a/src/main/java/appeng/client/gui/widgets/TabButton.java b/src/main/java/appeng/client/gui/widgets/TabButton.java index 06c00c66818..db1bce0bd8d 100644 --- a/src/main/java/appeng/client/gui/widgets/TabButton.java +++ b/src/main/java/appeng/client/gui/widgets/TabButton.java @@ -59,7 +59,7 @@ public TabButton(final ItemStack ico, final ITextComponent message, final ItemRe } @Override - public void renderButton(MatrixStack matrixStack, final int x, final int y, float partial) { + public void renderWidget(MatrixStack matrixStack, final int x, final int y, float partial) { if (this.visible) { // Selects the button border from the sprite-sheet, where each type occupies a // 2x2 slot diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java index 03afa06947a..521145f95a5 100644 --- a/src/main/java/appeng/client/gui/widgets/ToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -53,7 +53,7 @@ public void setState(final boolean isOn) { } @Override - public void renderButton(MatrixStack matrixStack, final int mouseX, final int mouseY, final float partial) { + public void renderWidget(MatrixStack matrixStack, final int mouseX, final int mouseY, final float partial) { if (this.visible) { Icon.TOOLBAR_BUTTON_BACKGROUND.getBlitter().dest(x, y).blit(matrixStack, getBlitOffset()); getIcon().getBlitter().dest(x, y).blit(matrixStack, getBlitOffset()); diff --git a/src/main/java/appeng/client/gui/widgets/VerticalButtonBar.java b/src/main/java/appeng/client/gui/widgets/VerticalButtonBar.java index 9abb1384669..9680c822e28 100644 --- a/src/main/java/appeng/client/gui/widgets/VerticalButtonBar.java +++ b/src/main/java/appeng/client/gui/widgets/VerticalButtonBar.java @@ -90,7 +90,7 @@ public void updateBeforeRender() { button.x = screenOrigin.getX() + position.getX() - MARGIN - button.getWidth(); button.y = screenOrigin.getY() + currentY; - currentY += button.getHeightRealms() + VERTICAL_SPACING; + currentY += button.getHeight() + VERTICAL_SPACING; maxWidth = Math.max(button.getWidth(), maxWidth); } diff --git a/src/main/java/appeng/client/render/overlay/OverlayRenderType.java b/src/main/java/appeng/client/render/overlay/OverlayRenderType.java index 470033a27fe..c7ea4d6c329 100644 --- a/src/main/java/appeng/client/render/overlay/OverlayRenderType.java +++ b/src/main/java/appeng/client/render/overlay/OverlayRenderType.java @@ -34,10 +34,10 @@ */ public class OverlayRenderType extends RenderType { - public OverlayRenderType(String p_i225992_1_, VertexFormat p_i225992_2_, int p_i225992_3_, int p_i225992_4_, - boolean p_i225992_5_, boolean p_i225992_6_, Runnable p_i225992_7_, Runnable p_i225992_8_) { - super(p_i225992_1_, p_i225992_2_, p_i225992_3_, p_i225992_4_, p_i225992_5_, p_i225992_6_, p_i225992_7_, - p_i225992_8_); + public OverlayRenderType(String nameIn, VertexFormat formatIn, int drawModeIn, int bufferSizeIn, + boolean useDelegateIn, boolean needsSortingIn, Runnable setupTaskIn, Runnable clearTaskIn) { + super(nameIn, formatIn, drawModeIn, bufferSizeIn, useDelegateIn, needsSortingIn, setupTaskIn, + clearTaskIn); } public static RenderType getBlockHilightFace() { diff --git a/src/main/java/appeng/client/render/tesr/ModularTESR.java b/src/main/java/appeng/client/render/tesr/ModularTESR.java index 34f71dd488f..223cc28bdcf 100644 --- a/src/main/java/appeng/client/render/tesr/ModularTESR.java +++ b/src/main/java/appeng/client/render/tesr/ModularTESR.java @@ -57,4 +57,4 @@ public void render(T te, float partialTicks, MatrixStack ms, IRenderTypeBuffer b ms.pop(); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java index 216461c7fe7..d30d18d1df3 100644 --- a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java +++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java @@ -224,4 +224,4 @@ public CopyMode getCopyMode() { private void setCopyMode(final CopyMode copyMode) { this.copyMode = copyMode; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/container/implementations/IOBusContainer.java b/src/main/java/appeng/container/implementations/IOBusContainer.java index 4f679b96f87..a10adae6c5b 100644 --- a/src/main/java/appeng/container/implementations/IOBusContainer.java +++ b/src/main/java/appeng/container/implementations/IOBusContainer.java @@ -23,7 +23,6 @@ import net.minecraftforge.items.IItemHandler; import appeng.api.config.SecurityPermissions; -import appeng.api.implementations.IUpgradeableHost; import appeng.container.SlotSemantic; import appeng.container.slot.FakeTypeOnlySlot; import appeng.container.slot.OptionalTypeOnlyFakeSlot; diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/main/java/appeng/container/implementations/PriorityContainer.java index c819e689ef9..aa5473b01d9 100644 --- a/src/main/java/appeng/container/implementations/PriorityContainer.java +++ b/src/main/java/appeng/container/implementations/PriorityContainer.java @@ -20,10 +20,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.tileentity.TileEntity; import appeng.api.config.SecurityPermissions; -import appeng.api.parts.IPart; import appeng.container.AEBaseContainer; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java index 9bda2f5134c..efd4be7e3b9 100644 --- a/src/main/java/appeng/container/slot/RestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -21,9 +21,6 @@ import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; -import javax.swing.text.StringContent; - import com.google.common.collect.ImmutableList; import net.minecraft.entity.player.PlayerEntity; @@ -31,8 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.items.IItemHandler; @@ -49,7 +44,6 @@ import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.cells.ICellWorkbenchItem; import appeng.client.gui.Icon; -import appeng.client.gui.widgets.ITooltip; import appeng.core.Api; import appeng.items.misc.EncodedPatternItem; import appeng.recipes.handlers.GrinderRecipes; diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 2f443c3f3de..f2090ea8162 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -26,4 +26,4 @@ public static void init() { INSTANCE = new AEItemGroup("appliedenergistics2"); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index c9ed1e690a5..32398b5903a 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -713,7 +713,7 @@ static boolean shouldGenerateIn(ResourceLocation id, AEConfig.instance().getQuartzOresPerCluster())) .withPlacement(Placement.RANGE/* RANGE */.configure(new TopSolidRangeConfig(12, 12, 72))) .square/* spreadHorizontally */() - .func_242731_b/* repeat */(AEConfig.instance().getQuartzOresClusterAmount())); + .count/* repeat */(AEConfig.instance().getQuartzOresClusterAmount())); } private static ConfiguredFeature registerChargedQuartzOreFeature() { diff --git a/src/main/java/appeng/core/api/ApiClientHelper.java b/src/main/java/appeng/core/api/ApiClientHelper.java index a16139d4d00..ae9d0d8731c 100644 --- a/src/main/java/appeng/core/api/ApiClientHelper.java +++ b/src/main/java/appeng/core/api/ApiClientHelper.java @@ -52,11 +52,11 @@ public > void addCellInformation(ICellInventoryHandler final ICellInventory cellInventory = handler.getCellInv(); if (cellInventory != null) { - lines.add(new StringTextComponent(cellInventory.getUsedBytes() + " ").append(GuiText.Of.text()) - .appendString(" " + cellInventory.getTotalBytes() + " ").append(GuiText.BytesUsed.text())); + lines.add(new StringTextComponent(cellInventory.getUsedBytes() + " ").appendSibling(GuiText.Of.text()) + .appendString(" " + cellInventory.getTotalBytes() + " ").appendSibling(GuiText.BytesUsed.text())); - lines.add(new StringTextComponent(cellInventory.getStoredItemTypes() + " ").append(GuiText.Of.text()) - .appendString(" " + cellInventory.getTotalItemTypes() + " ").append(GuiText.Types.text())); + lines.add(new StringTextComponent(cellInventory.getStoredItemTypes() + " ").appendSibling(GuiText.Of.text()) + .appendString(" " + cellInventory.getTotalItemTypes() + " ").appendSibling(GuiText.Types.text())); } if (handler.isPreformatted()) { @@ -64,9 +64,9 @@ public > void addCellInformation(ICellInventoryHandler : GuiText.Excluded).getLocal(); if (handler.isFuzzy()) { - lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ").append(GuiText.Fuzzy.text())); + lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ").appendSibling(GuiText.Fuzzy.text())); } else { - lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ").append(GuiText.Precise.text())); + lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ").appendSibling(GuiText.Precise.text())); } } @@ -77,4 +77,4 @@ public ICellModelRegistry cells() { return this.cells; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index 4be9c44f7a5..83fabfcd87e 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -123,7 +123,7 @@ public IFormattableTextComponent withSuffix(String text) { } public IFormattableTextComponent withSuffix(ITextComponent text) { - return text().deepCopy().append(text); + return text().deepCopy().appendSibling(text); } public IFormattableTextComponent text(Object... args) { diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java index 49d73ca9186..72345bacfdb 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java @@ -30,7 +30,6 @@ import appeng.api.config.Settings; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; -import appeng.container.AEBaseContainer; import appeng.container.implementations.CellWorkbenchContainer; import appeng.container.implementations.LevelEmitterContainer; import appeng.container.implementations.PriorityContainer; diff --git a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java index 27cc576c4e3..6fa1d58836d 100644 --- a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java +++ b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java @@ -23,7 +23,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index 83225272d64..5f7db0cf681 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -76,7 +76,7 @@ public TinyTNTPrimedEntity(final World w, final double x, final double y, final @Nullable @Override - public LivingEntity getTntPlacedBy() { + public LivingEntity getIgniter() { return this.placedBy; } diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java index c538d4d5eb0..f416c7ae7f9 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java @@ -30,7 +30,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java index eb81f580ff2..dd2bdd7387d 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java @@ -52,7 +52,7 @@ public FluidTankWidget(IAEFluidTank tank, int slot) { } @Override - public void renderButton(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { if (this.visible) { final IAEFluidStack fluidStack = this.tank.getFluidInSlot(this.slot); if (fluidStack != null && fluidStack.getStackSize() > 0) { diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/main/java/appeng/helpers/InvalidPatternHelper.java index 12f2b847d18..bfe7db2fb6f 100644 --- a/src/main/java/appeng/helpers/InvalidPatternHelper.java +++ b/src/main/java/appeng/helpers/InvalidPatternHelper.java @@ -126,7 +126,8 @@ public ItemStack getItem() { } public ITextComponent getFormattedToolTip() { - IFormattableTextComponent result = new StringTextComponent(this.getCount() + " ").append(this.getName()); + IFormattableTextComponent result = new StringTextComponent(this.getCount() + " ") + .appendSibling(this.getName()); if (!this.isValid()) { result.mergeStyle(TextFormatting.RED); diff --git a/src/main/java/appeng/hooks/ticking/PlayerColor.java b/src/main/java/appeng/hooks/ticking/PlayerColor.java index ac574e6e561..3548b734376 100644 --- a/src/main/java/appeng/hooks/ticking/PlayerColor.java +++ b/src/main/java/appeng/hooks/ticking/PlayerColor.java @@ -60,4 +60,4 @@ boolean isDone() { return this.ticksLeft <= 0; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/hooks/ticking/ServerTileRepo.java b/src/main/java/appeng/hooks/ticking/ServerTileRepo.java index 3f99048ecdb..e2103e5e1f4 100644 --- a/src/main/java/appeng/hooks/ticking/ServerTileRepo.java +++ b/src/main/java/appeng/hooks/ticking/ServerTileRepo.java @@ -98,4 +98,4 @@ public Long2ObjectMap> getTiles(IWorld world) { return tiles.get(world); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 420e97795d9..c3aa82db9ad 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -21,8 +21,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import appeng.items.contents.NetworkToolViewer; - public abstract class AEBaseItem extends Item { public AEBaseItem(Item.Properties properties) { diff --git a/src/main/java/appeng/items/contents/CellConfig.java b/src/main/java/appeng/items/contents/CellConfig.java index 32d317487f7..f678e3fcd44 100644 --- a/src/main/java/appeng/items/contents/CellConfig.java +++ b/src/main/java/appeng/items/contents/CellConfig.java @@ -36,4 +36,4 @@ public CellConfig(final ItemStack is) { protected void onContentsChanged(int slot) { this.writeToNBT(this.is.getOrCreateTag(), "list"); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/items/contents/CellUpgrades.java b/src/main/java/appeng/items/contents/CellUpgrades.java index 0b135215fcd..f42bb6279db 100644 --- a/src/main/java/appeng/items/contents/CellUpgrades.java +++ b/src/main/java/appeng/items/contents/CellUpgrades.java @@ -35,4 +35,4 @@ public CellUpgrades(final ItemStack is, final int upgrades) { protected void onContentsChanged(int slot) { this.writeToNBT(this.is.getOrCreateTag(), "upgrades"); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index 7799ed82a6b..ef2cfac9e20 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -125,19 +125,20 @@ public void addInformation(final ItemStack stack, final World world, final List< final ITextComponent label = (invalid.isCraftable() ? GuiText.Crafts.text() : GuiText.Creates.text()) .deepCopy().appendString(": "); - final ITextComponent and = new StringTextComponent(" ").deepCopy().append(GuiText.And.text()).deepCopy() + final ITextComponent and = new StringTextComponent(" ").deepCopy().appendSibling(GuiText.And.text()) + .deepCopy() .appendString(" "); final ITextComponent with = GuiText.With.text().deepCopy().appendString(": "); boolean first = true; for (final InvalidPatternHelper.PatternIngredient output : invalid.getOutputs()) { - lines.add((first ? label : and).deepCopy().append(output.getFormattedToolTip())); + lines.add((first ? label : and).deepCopy().appendSibling(output.getFormattedToolTip())); first = false; } first = true; for (final InvalidPatternHelper.PatternIngredient input : invalid.getInputs()) { - lines.add((first ? with : and).deepCopy().append(input.getFormattedToolTip())); + lines.add((first ? with : and).deepCopy().appendSibling(input.getFormattedToolTip())); first = false; } @@ -145,7 +146,7 @@ public void addInformation(final ItemStack stack, final World world, final List< final ITextComponent substitutionLabel = GuiText.Substitute.text().deepCopy().appendString(" "); final ITextComponent canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text() : GuiText.No.text(); - lines.add(substitutionLabel.deepCopy().append(canSubstitute)); + lines.add(substitutionLabel.deepCopy().appendSibling(canSubstitute)); } return; @@ -163,7 +164,8 @@ public void addInformation(final ItemStack stack, final World world, final List< final ITextComponent label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()).deepCopy() .appendString(": "); - final ITextComponent and = new StringTextComponent(" ").deepCopy().append(GuiText.And.text()).appendString(" "); + final ITextComponent and = new StringTextComponent(" ").deepCopy().appendSibling(GuiText.And.text()) + .appendString(" "); final ITextComponent with = GuiText.With.text().deepCopy().appendString(": "); boolean first = true; @@ -173,7 +175,7 @@ public void addInformation(final ItemStack stack, final World world, final List< } lines.add((first ? label : and).deepCopy().appendString(anOut.getStackSize() + "x ") - .append(Platform.getItemDisplayName(anOut))); + .appendSibling(Platform.getItemDisplayName(anOut))); first = false; } @@ -184,7 +186,7 @@ public void addInformation(final ItemStack stack, final World world, final List< } lines.add((first ? with : and).deepCopy().appendString(anIn.getStackSize() + "x ") - .append(Platform.getItemDisplayName(anIn))); + .appendSibling(Platform.getItemDisplayName(anIn))); first = false; } @@ -192,7 +194,7 @@ public void addInformation(final ItemStack stack, final World world, final List< final ITextComponent substitutionLabel = GuiText.Substitute.text().deepCopy().appendString(" "); final ITextComponent canSubstitute = substitute ? GuiText.Yes.text() : GuiText.No.text(); - lines.add(substitutionLabel.deepCopy().append(canSubstitute)); + lines.add(substitutionLabel.deepCopy().appendSibling(canSubstitute)); } } diff --git a/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index f4836493c11..2770e166386 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -78,7 +78,7 @@ public ITextComponent getDisplayName(ItemStack is) { try { final ItemStack in = this.getTextureItem(is); if (!in.isEmpty()) { - return super.getDisplayName(is).deepCopy().appendString(" - ").append(in.getDisplayName()); + return super.getDisplayName(is).deepCopy().appendString(" - ").appendSibling(in.getDisplayName()); } } catch (final Throwable ignored) { diff --git a/src/main/java/appeng/items/tools/BiometricCardItem.java b/src/main/java/appeng/items/tools/BiometricCardItem.java index 54f8dc7c3d1..c3e72cbad23 100644 --- a/src/main/java/appeng/items/tools/BiometricCardItem.java +++ b/src/main/java/appeng/items/tools/BiometricCardItem.java @@ -168,7 +168,7 @@ public void addInformation(final ItemStack stack, final World world, final List< if (msg == null) { msg = sp.getDisplayName(); } else { - msg = msg.deepCopy().appendString(", ").append(sp.getDisplayName()); + msg = msg.deepCopy().appendString(", ").appendSibling(sp.getDisplayName()); } } lines.add(msg); diff --git a/src/main/java/appeng/items/tools/NetworkToolItem.java b/src/main/java/appeng/items/tools/NetworkToolItem.java index daa6825f205..e9f7fc5e039 100644 --- a/src/main/java/appeng/items/tools/NetworkToolItem.java +++ b/src/main/java/appeng/items/tools/NetworkToolItem.java @@ -36,7 +36,6 @@ import net.minecraft.world.World; import appeng.api.implementations.guiobjects.IGuiItem; -import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.api.implementations.items.IAEWrench; import appeng.api.networking.IGridHost; import appeng.api.parts.IPartHost; @@ -53,10 +52,8 @@ import appeng.core.sync.packets.ClickPacket; import appeng.items.AEBaseItem; import appeng.items.contents.NetworkToolViewer; -import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.InteractionUtil; import appeng.util.Platform; -import appeng.util.inv.IAEAppEngInventory; public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index 421b7078bce..d4bdcebca95 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -197,7 +197,7 @@ public ITextComponent getDisplayName(final ItemStack is) { extra = new TranslationTextComponent(selected.translationKey); } - return super.getDisplayName(is).deepCopy().appendString(" - ").append(extra); + return super.getDisplayName(is).deepCopy().appendString(" - ").appendSibling(extra); } public AEColor getActiveColor(final ItemStack tol) { diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index 697b0474d72..52413eef327 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -67,7 +67,7 @@ public void addInformation(final ItemStack stack, final World world, final List< lines.add(GuiText.StoredEnergy.text().deepCopy() .appendString(':' + MessageFormat.format(" {0,number,#} ", internalCurrentPower)) - .append(PowerUnits.AE.textComponent()) + .appendSibling(PowerUnits.AE.textComponent()) .appendString(" - " + MessageFormat.format(" {0,number,#.##%} ", percent))); } diff --git a/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java index 124615529f0..998c039715a 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java @@ -39,4 +39,4 @@ public boolean getIsRepairable(final ItemStack a, final ItemStack b) { return Platform.canRepair(this.type, a, b); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java b/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java index 0aa9d3d0f91..d80d1b74621 100644 --- a/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java +++ b/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java @@ -35,4 +35,4 @@ public IGridConnection getConnection() { public void setConnection(final IGridConnection connection) { this.connection = connection; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java index d6048ee19a9..6f5bb04a422 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java @@ -38,4 +38,4 @@ public IGridConnection getConnection() { public MEP2PTunnelPart getTunnel() { return this.tunnel; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 05b8aa95ac3..aaa9f756941 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -1165,7 +1165,7 @@ public void updateName() { if (te.hasCustomInventoryName()) { if (this.myName != null) { - this.myName.deepCopy().appendString(" ").append(te.getCustomInventoryName()); + this.myName.deepCopy().appendString(" ").appendSibling(te.getCustomInventoryName()); } else { this.myName = te.getCustomInventoryName().deepCopy(); } diff --git a/src/main/java/appeng/parts/misc/SharedStorageBusPart.java b/src/main/java/appeng/parts/misc/SharedStorageBusPart.java index fe3bfeb3f27..d0970d7109e 100644 --- a/src/main/java/appeng/parts/misc/SharedStorageBusPart.java +++ b/src/main/java/appeng/parts/misc/SharedStorageBusPart.java @@ -168,4 +168,4 @@ protected int getUpgradeSlots() { public float getCableConnectionLength(AECableType cable) { return 4; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/recipes/entropy/EntropyMode.java b/src/main/java/appeng/recipes/entropy/EntropyMode.java index fa9f97a7a3b..4ddfdfa1c35 100644 --- a/src/main/java/appeng/recipes/entropy/EntropyMode.java +++ b/src/main/java/appeng/recipes/entropy/EntropyMode.java @@ -21,4 +21,4 @@ public enum EntropyMode { HEAT, COOL -} \ No newline at end of file +} diff --git a/src/main/java/appeng/recipes/entropy/MultipleValuesMatcher.java b/src/main/java/appeng/recipes/entropy/MultipleValuesMatcher.java index 585b9f93916..a2afd972ea1 100644 --- a/src/main/java/appeng/recipes/entropy/MultipleValuesMatcher.java +++ b/src/main/java/appeng/recipes/entropy/MultipleValuesMatcher.java @@ -78,4 +78,4 @@ public static MultipleValuesMatcher readFromPacket(StateContainer state return create(stateContainer, propertyName, values); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/recipes/entropy/RangeValueMatcher.java b/src/main/java/appeng/recipes/entropy/RangeValueMatcher.java index 12ab32fd8f5..9d80b130a98 100644 --- a/src/main/java/appeng/recipes/entropy/RangeValueMatcher.java +++ b/src/main/java/appeng/recipes/entropy/RangeValueMatcher.java @@ -68,4 +68,4 @@ public static StateMatcher readFromPacket(StateContainer stateContainer, P String maxName = buffer.readString(); return create(stateContainer, propertyName, minName, maxName); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/recipes/entropy/SingleValueMatcher.java b/src/main/java/appeng/recipes/entropy/SingleValueMatcher.java index 271c6fb1d06..aeda13e6cd7 100644 --- a/src/main/java/appeng/recipes/entropy/SingleValueMatcher.java +++ b/src/main/java/appeng/recipes/entropy/SingleValueMatcher.java @@ -63,4 +63,4 @@ public static SingleValueMatcher readFromPacket(StateContainer stateCon String value = buffer.readString(); return create(stateContainer, propertyName, value); } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 3fa64a730ec..38232510012 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -165,4 +165,4 @@ public IRecipeSerializer getSerializer() { return SERIALIZER; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index 666e93912cc..024356e9e66 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -95,4 +95,4 @@ public static IRecipeSerializer getSerializer(FacadeItem facade) { return SERIALIZER; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java index b68e5293965..af1d8ed2d35 100644 --- a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java +++ b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java @@ -267,8 +267,8 @@ public void call(MinecraftServer srv, CommandContext ctx, Command ITextComponent tpLink = new StringTextComponent("Origin: " + origin) .modifyStyle(makeCommandLink("/ae2 spatial tp " + plot.getId(), "Click to teleport into plot")); - IFormattableTextComponent message = new StringTextComponent("").append(infoLink) - .appendString(" Size: " + size + " ").append(tpLink); + IFormattableTextComponent message = new StringTextComponent("").appendSibling(infoLink) + .appendString(" Size: " + size + " ").appendSibling(tpLink); sender.sendFeedback(message, true); } @@ -307,7 +307,8 @@ private static SpatialStoragePlot getPlot(int plotId) { private static void sendKeyValuePair(CommandSource source, String label, ITextComponent value) { source.sendFeedback( new StringTextComponent("") - .append(new StringTextComponent(label + ": ").mergeStyle(TextFormatting.BOLD)).append(value), + .appendSibling(new StringTextComponent(label + ": ").mergeStyle(TextFormatting.BOLD)) + .appendSibling(value), true); } diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java index 3305fa64c20..93b2ad012ab 100644 --- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java +++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java @@ -169,7 +169,7 @@ private static void test(MinecraftServer srv, final CommandSource sender, boolea } IFormattableTextComponent msg = new StringTextComponent(" #" + (i + 1) + " "); - msg.append(getClickablePosition(world, settings, pos)).append(restOfLine); + msg.appendSibling(getClickablePosition(world, settings, pos)).appendSibling(restOfLine); // Add a tooltip String biomeId = world.func_242406_i(pos).map(bk -> bk.getLocation().toString()).orElse("unknown"); diff --git a/src/main/java/appeng/spatial/SpatialStorageBiome.java b/src/main/java/appeng/spatial/SpatialStorageBiome.java index da383dd3e2a..1869c49b7ed 100644 --- a/src/main/java/appeng/spatial/SpatialStorageBiome.java +++ b/src/main/java/appeng/spatial/SpatialStorageBiome.java @@ -39,6 +39,6 @@ public class SpatialStorageBiome { .temperature(0.5F).downfall(0.5F) .setEffects(new BiomeAmbience.Builder().setWaterColor(4159204).setWaterFogColor(329011).setFogColor(0) .withSkyColor(0x111111).build()) - .withMobSpawnSettings(new MobSpawnInfo.Builder().withCreatureSpawnProbability(0).copy()).build(); + .withMobSpawnSettings(new MobSpawnInfo.Builder().withCreatureSpawnProbability(0).build()).build(); } diff --git a/src/main/java/appeng/spatial/SpatialStorageWorldData.java b/src/main/java/appeng/spatial/SpatialStorageWorldData.java index d535c23da2a..7d042357251 100644 --- a/src/main/java/appeng/spatial/SpatialStorageWorldData.java +++ b/src/main/java/appeng/spatial/SpatialStorageWorldData.java @@ -125,4 +125,4 @@ public CompoundNBT write(CompoundNBT tag) { return tag; } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java index a768635c5fe..14c88e9606c 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java @@ -36,10 +36,10 @@ public class MeteoriteStructure extends Structure { public static final ResourceLocation ID = AppEng.makeId("meteorite"); - public static final Structure INSTANCE = new MeteoriteStructure(NoFeatureConfig.field_236558_a_); + public static final Structure INSTANCE = new MeteoriteStructure(NoFeatureConfig.CODEC); public static final StructureFeature> CONFIGURED_INSTANCE = INSTANCE - .withConfiguration(NoFeatureConfig.field_236559_b_); + .withConfiguration(NoFeatureConfig.INSTANCE); public MeteoriteStructure(Codec configCodec) { super(configCodec); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java index 37d251dc921..bb8224ad9dd 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java @@ -247,4 +247,4 @@ private FalloutMode getFalloutFromBaseBlock(BlockState blockState) { } } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java index 87b8b7f689e..c102fb815ce 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java @@ -64,4 +64,4 @@ public void getRandomInset(final IWorld w, BlockPos pos) { this.getOther(w, pos, a - BLOCK_THRESHOLD_STEP); } } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java index e516c2c592f..d1d878d326a 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java @@ -45,4 +45,4 @@ public void getOther(final IWorld w, BlockPos pos, final double a) { this.putter.put(w, pos, Blocks.GLASS.getDefaultState()); } } -} \ No newline at end of file +} diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java index eac0861f1b4..8e33b552746 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java @@ -48,4 +48,4 @@ public void getOther(final IWorld w, BlockPos pos, final double a) { this.putter.put(w, pos, Blocks.ICE.getDefaultState()); } } -} \ No newline at end of file +} diff --git a/src/main/java/team/chisel/ctm/api/IFacade.java b/src/main/java/team/chisel/ctm/api/IFacade.java index 56659856809..cdb7bf351a6 100644 --- a/src/main/java/team/chisel/ctm/api/IFacade.java +++ b/src/main/java/team/chisel/ctm/api/IFacade.java @@ -1,14 +1,14 @@ package team.chisel.ctm.api; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.block.BlockState; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /** * To be implemented on blocks that "hide" another block inside, so connected textures can still be accomplished. */ diff --git a/src/test/java/appeng/client/gui/MockResourceManager.java b/src/test/java/appeng/client/gui/MockResourceManager.java index ebdcae701a5..c41a79033b1 100644 --- a/src/test/java/appeng/client/gui/MockResourceManager.java +++ b/src/test/java/appeng/client/gui/MockResourceManager.java @@ -19,7 +19,9 @@ package appeng.client.gui; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/test/java/appeng/client/gui/ScreenRegistrationTest.java b/src/test/java/appeng/client/gui/ScreenRegistrationTest.java index 7bd18acc621..612097ddef1 100644 --- a/src/test/java/appeng/client/gui/ScreenRegistrationTest.java +++ b/src/test/java/appeng/client/gui/ScreenRegistrationTest.java @@ -132,4 +132,4 @@ private void collectMissingTranslations(String path, ITextComponent text, List