Merge remote-tracking branch 'origin/master' into fabric-1.16

api/src/main/java/appeng/api/networking/IGridCacheRegistry.java

@@ -36,10 +36,10 @@ public interface IGridCacheRegistry {
      * Register a new grid cache for use during operation, must be called during the
      * loading phase.
      *
-     * @param iface grid cache class
+     * @param iface   grid cache class
+     * @param factory Factory for creating a new instance for each constructed grid
      */
-    void registerGridCache(@Nonnull Class<? extends IGridCache> iface,
-            @Nonnull Class<? extends IGridCache> implementation);
+    <T extends IGridCache> void registerGridCache(@Nonnull Class<T> iface, @Nonnull IGridCacheFactory<T> factory);
 
     /**
      * requests a new INSTANCE of a grid cache for use, used internally

api/src/main/java/appeng/api/parts/IPart.java

@@ -353,7 +353,9 @@ public interface IPart extends ICustomCableConnection {
 
     /**
      * This will be used by the core to add information about this part to a crash
-     * report if it is attached to a host that caused a crash during tick processing.
+     * report if it is attached to a host that caused a crash during tick
+     * processing.
+     *
      * @param section The crash report section the information will be added to.
      */
     default void addEntityCrashInfo(CrashReportSection section) {