Reconfigure Spotless to leave comments alone, and removed some dead code.

build.gradle

@@ -20,7 +20,6 @@ buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
         maven { url = 'https://repo.spongepowered.org/maven' }
-        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -40,9 +39,15 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: "eclipse"
 
+// All jar files from this folder will be added automatically as runtime mod dependencies
+def extraModsDir = "extra-mods-${minecraft_version}"
+
 repositories {
+    flatDir {
+        name "extra-mods"
+        dir file(extraModsDir)
+    }
     mavenLocal()
-    jcenter()
     mavenCentral()
     maven { // modmaven, maven proxy
         name 'modmaven'
@@ -61,6 +66,16 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
     runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
 
+    // Locally sourced extra mods for runtime (i.e. testing)
+    for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
+        def basename = extraModJar.name.substring(0, extraModJar.name.length() - ".jar".length())
+        def versionSep = basename.lastIndexOf('-')
+        assert versionSep != -1
+        def artifactId = basename.substring(0, versionSep)
+        def version = basename.substring(versionSep + 1)
+        runtimeOnly fg.deobf("extra-mods:$artifactId:$version")
+    }
+
     // unit test dependencies
     testCompile "junit:junit:4.13"
     

codeformat/codeformat.xml

@@ -157,7 +157,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
@@ -192,7 +192,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
@@ -285,7 +285,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>

gradle.properties

@@ -11,7 +11,7 @@ artifact_basename=appliedenergistics2
 minecraft_release=1.16
 minecraft_version=1.16.3
 mcp_mappings=20200916-1.16.2
-forge_version=34.0.8
+forge_version=34.1.15
 
 #########################################################
 # Provided APIs                                         #

src/main/java/appeng/client/render/StackSizeRenderer.java

@@ -67,8 +67,7 @@ public class StackSizeRenderer {
         final float inverseScaleFactor = 1.0f / scaleFactor;
         final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1;
 
-        TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from
+        TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from ItemRenderer.renderItemOverlayIntoGUI
-                                                                                    // ItemRenderer.renderItemOverlayIntoGUI
                 null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null);
 
         RenderSystem.disableBlend();

src/main/java/appeng/core/AppEng.java

@@ -177,42 +177,6 @@ public final class AppEng {
         return this.registration.advancementTriggers;
     }
 
-//	@EventHandler
-//	private void preInit( final FMLPreInitializationEvent event )
-//	{
-//		final Stopwatch watch = Stopwatch.createStarted();
-//		this.configDirectory = new File( event.getModConfigurationDirectory().getPath(), "AppliedEnergistics2" );
-//
-//		final File configFile = new File( this.configDirectory, "AppliedEnergistics2.cfg" );
-//		final File facadeFile = new File( this.configDirectory, "Facades.cfg" );
-//		final File versionFile = new File( this.configDirectory, "VersionChecker.cfg" );
-//		final File recipeFile = new File( this.configDirectory, "CustomRecipes.cfg" );
-//		final Configuration recipeConfiguration = new Configuration( recipeFile );
-//
-//		AEConfig.init( configFile );
-//		FacadeConfig.init( facadeFile );
-//
-//		AELog.info( "Pre Initialization ( started )" );
-//
-//
-//		for( final IntegrationType type : IntegrationType.values() )
-//		{
-//			IntegrationRegistry.INSTANCE.add( type );
-//		}
-//
-//		this.registration.preInitialize( event );
-//
-//		if( Platform.isClient() )
-//		{
-//			AppEng.proxy.preinit();
-//		}
-//
-//		IntegrationRegistry.INSTANCE.preInit();
-//
-//		AELog.info( "Pre Initialization ( ended after " + watch.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
-//
-//	}
-
     private void startService(final String serviceName, final Thread thread) {
         thread.setName(serviceName);
         thread.setPriority(Thread.MIN_PRIORITY);

src/main/java/appeng/util/Platform.java

@@ -1064,11 +1064,8 @@ public class Platform {
             if (items != null && checkFuzzy) {
                 for (final IAEItemStack x : items) {
                     final ItemStack sh = x.getDefinition();
-                    if ((Platform.itemComparisons().isEqualItemType(providedTemplate,
+                    if ((Platform.itemComparisons().isEqualItemType(providedTemplate, sh))
-                            sh) /* FIXME || ae_req.sameOre( x ) */ ) && !ItemStack.areItemsEqual(sh, output)) { // Platform.isSameItemType(
+                            && !ItemStack.areItemsEqual(sh, output)) {
-                                                                                                                // sh,
-                                                                                                                // providedTemplate
-                                                                                                                // )
                         final ItemStack cp = sh.copy();
                         cp.setCount(1);
                         ci.setInventorySlotContents(slot, cp);

src/main/java/appeng/util/helpers/ItemComparisonHelper.java

@@ -90,14 +90,6 @@ public class ItemComparisonHelper {
                 return (percentDamagedOfA > mode.breakPoint) == (percentDamagedOfB > mode.breakPoint);
             }
         }
-// FIXME
-//		final OreReference aOR = OreHelper.INSTANCE.getOre( a ).orElse( null );
-//		final OreReference bOR = OreHelper.INSTANCE.getOre( b ).orElse( null );
-//
-//		if( OreHelper.INSTANCE.sameOre( aOR, bOR ) )
-//		{
-//			return true;
-//		}
 
         return a.isItemEqual(b);
     }