Updated Forge and dependencies (AppliedEnergistics#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

@@ -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/**'

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

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                                            #

src/api/java/appeng/api/IAppEngApi.java

@@ -69,4 +69,4 @@ public interface IAppEngApi {
      */
     IClientHelper client();
 
-}
+}

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));
     }
-}
+}

src/api/java/appeng/api/config/ActionItems.java

@@ -25,4 +25,4 @@
 
 public enum ActionItems {
     WRENCH, CLOSE, STASH, ENCODE, ENABLE_SUBSTITUTION, DISABLE_SUBSTITUTION
-}
+}

src/api/java/appeng/api/config/CondenserOutput.java

@@ -33,4 +33,4 @@ public enum CondenserOutput {
 
     public int requiredPower = 0;
 
-}
+}

src/api/java/appeng/api/config/FullnessMode.java

@@ -25,4 +25,4 @@
 
 public enum FullnessMode {
     EMPTY, HALF, FULL
-}
+}

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);
     }
 
-}
+}

src/api/java/appeng/api/config/IncludeExclude.java

@@ -25,4 +25,4 @@
 
 public enum IncludeExclude {
     WHITELIST, BLACKLIST
-}
+}

src/api/java/appeng/api/config/LevelEmitterMode.java

@@ -29,4 +29,4 @@ public enum LevelEmitterMode {
 
     STORABLE_AMOUNT
 
-}
+}

src/api/java/appeng/api/config/LevelType.java

@@ -29,4 +29,4 @@ public enum LevelType {
 
     ENERGY_LEVEL
 
-}
+}

src/api/java/appeng/api/config/NetworkEmitterMode.java

@@ -31,4 +31,4 @@ public enum NetworkEmitterMode {
 
     CHANNEL_ERROR
 
-}
+}

src/api/java/appeng/api/config/OperationMode.java

@@ -25,4 +25,4 @@
 
 public enum OperationMode {
     FILL, EMPTY
-}
+}

src/api/java/appeng/api/config/PowerUnits.java

@@ -64,4 +64,4 @@ public ITextComponent textComponent() {
         return new TranslationTextComponent(unlocalizedName);
     }
 
-}
+}

src/api/java/appeng/api/config/RedstoneMode.java

@@ -25,4 +25,4 @@
 
 public enum RedstoneMode {
     IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE
-}
+}

src/api/java/appeng/api/config/RelativeDirection.java

@@ -25,4 +25,4 @@
 
 public enum RelativeDirection {
     LEFT, RIGHT, UP, DOW
-}
+}

src/api/java/appeng/api/config/SortDir.java

@@ -25,4 +25,4 @@
 
 public enum SortDir {
     ASCENDING, DESCENDING
-}
+}

src/api/java/appeng/api/config/SortOrder.java

@@ -25,4 +25,4 @@
 
 public enum SortOrder {
     NAME, AMOUNT, MOD
-}
+}

src/api/java/appeng/api/config/TerminalStyle.java

@@ -31,4 +31,4 @@ public enum TerminalStyle {
 
     SMALL
 
-}
+}

src/api/java/appeng/api/config/ViewItems.java

@@ -25,4 +25,4 @@
 
 public enum ViewItems {
     ALL, STORED, CRAFTABLE
-}
+}

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);
-}
+}

src/api/java/appeng/api/features/ILocatable.java

@@ -37,4 +37,4 @@ public interface ILocatable {
      * @return the serial for a locatable object
      */
     long getLocatableSerial();
-}
+}

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);
-}
+}

src/api/java/appeng/api/features/IP2PTunnelRegistry.java

@@ -57,4 +57,4 @@ public interface IP2PTunnelRegistry {
      */
     @Nonnull
     TunnelType getTunnelTypeByItem(ItemStack trigger);
-}
+}

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);
-}
+}

src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java

@@ -66,4 +66,4 @@ public interface IAEItemPowerStorage {
      */
     AccessRestriction getPowerFlow(ItemStack stack);
 
-}
+}

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);
-}
+}

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();
-}
+}

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);
-}
+}

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);
-}
+}

src/api/java/appeng/api/networking/IGrid.java

@@ -105,4 +105,4 @@ public interface IGrid {
      */
     @Nonnull
     IGridNode getPivot();
-}
+}

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();
-}
+}

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;
 
-}
+}

src/api/java/appeng/api/networking/events/statistics/MENetworkChunkEvent.java

@@ -71,4 +71,4 @@ public MENetworkChunkRemoved(ServerWorld world, ChunkPos chunkPos) {
 
     }
 
-}
+}

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();
-}
+}

src/api/java/appeng/api/networking/security/IActionSource.java

@@ -71,4 +71,4 @@ public interface IActionSource {
      */
     @Nonnull
     <T> Optional<T> context(@Nonnull Class<T> key);
-}
+}

src/api/java/appeng/api/parts/IFacadePart.java

@@ -68,4 +68,4 @@ public interface IFacadePart {
      */
     BlockState getBlockState();
 
-}
+}

src/api/java/appeng/api/parts/IPartHost.java

@@ -188,4 +188,4 @@ public interface IPartHost extends ICustomCableConnection {
      */
     boolean isInWorld();
 
-}
+}

src/api/java/appeng/api/parts/IPartItem.java

@@ -56,4 +56,4 @@ public interface IPartItem<P extends IPart> {
      */
     P createPart(ItemStack is);
 
-}
+}

src/api/java/appeng/api/storage/ICellRegistry.java

@@ -102,4 +102,4 @@ public interface ICellRegistry {
     @Nullable
     <T extends IAEStack<T>> ICellInventoryHandler<T> getCellInventory(ItemStack is, ISaveProvider host,
             IStorageChannel<T> chan);
-}
+}

src/api/java/appeng/api/storage/cells/CellState.java

@@ -51,4 +51,4 @@ public enum CellState {
      * Full cell, technically could have free types
      */
     FULL;
-}
+}

src/api/java/appeng/api/storage/cells/ICellHandler.java

@@ -94,4 +94,4 @@ default <T extends IAEStack<T>> double cellIdleDrain(ItemStack is, ICellInventor
         }
         return 1.0;
     }
-}
+}

src/api/java/appeng/api/storage/data/IAEItemStack.java

@@ -113,4 +113,4 @@ public interface IAEItemStack extends IAEStack<IAEItemStack> {
      */
     boolean equals(ItemStack is);
 
-}
+}

src/api/java/appeng/api/storage/data/IItemContainer.java

@@ -61,4 +61,4 @@ public interface IItemContainer<T extends IAEStack<T>> {
      * @return true if there are no items in the list
      */
     boolean isEmpty();
-}
+}

src/api/java/appeng/api/storage/data/IItemList.java

@@ -81,4 +81,4 @@ public interface IItemList<T extends IAEStack<T>> extends IItemContainer<T>, Ite
      * resets stack sizes to 0.
      */
     void resetStatus();
-}
+}

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<ItemStack> drops);
-}
+}

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);
-}
+}

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);
-}
+}

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)));
         }
     }

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;
                 }