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/ClientHelper.java

@@ -169,16 +169,16 @@ public class ClientHelper extends ServerHelper {
     }
 
     private void postPlayerRender(final RenderLivingEvent.Pre p) {
-//	FIXME	final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() );
+        //	FIXME	final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() );
-//	FIXME	if( player != null )
+        //	FIXME	if( player != null )
-//	FIXME	{
+        //	FIXME	{
-//	FIXME		final AEColor col = player.myColor;
+        //	FIXME		final AEColor col = player.myColor;
-//	FIXME		final float r = 0xff & ( col.mediumVariant >> 16 );
+        //	FIXME		final float r = 0xff & ( col.mediumVariant >> 16 );
-//	FIXME		final float g = 0xff & ( col.mediumVariant >> 8 );
+        //	FIXME		final float g = 0xff & ( col.mediumVariant >> 8 );
-//	FIXME		final float b = 0xff & ( col.mediumVariant );
+        //	FIXME		final float b = 0xff & ( col.mediumVariant );
-//	FIXME		// FIXME: This is most certainly not going to work!
+        //	FIXME		// FIXME: This is most certainly not going to work!
-//	FIXME		GlStateManager.color4f( r / 255.0f, g / 255.0f, b / 255.0f, 1.0f );
+        //	FIXME		GlStateManager.color4f( r / 255.0f, g / 255.0f, b / 255.0f, 1.0f );
-//	FIXME	}
+        //	FIXME	}
     }
 
     private void spawnVibrant(final World w, final double x, final double y, final double z) {

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/client/render/effects/LightningFX.java

@@ -144,16 +144,16 @@ public class LightningFX extends SpriteTexturedParticle {
         for (int layer = 0; layer < 2; layer++) {
             if (layer == 0) {
                 scale = 0.04;
-//				FIXME offX *= 0.001;
+                // FIXME offX *= 0.001;
-//				FIXME offY *= 0.001;
+                // FIXME offY *= 0.001;
-//				FIXME offZ *= 0.001;
+                // FIXME offZ *= 0.001;
                 red = this.particleRed * j * 0.4f;
                 green = this.particleGreen * j * 0.25f;
                 blue = this.particleBlue * j * 0.45f;
             } else {
-//				FIXME offX = 0;
+                // FIXME offX = 0;
-//				FIXME offY = 0;
+                // FIXME offY = 0;
-//				FIXME offZ = 0;
+                // FIXME offZ = 0;
                 scale = 0.02;
                 red = this.particleRed * j * 0.9f;
                 green = this.particleGreen * j * 0.65f;

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/core/Registration.java

@@ -606,12 +606,12 @@ final class Registration {
         blocks.energyCell().maybeItem().ifPresent(cell -> registries.charger().addChargeRate(cell, 8000d));
         blocks.energyCellDense().maybeItem().ifPresent(cell -> registries.charger().addChargeRate(cell, 16000d));
 
-// FIXME		// add villager trading to black smiths for a few basic materials
+        // FIXME		// add villager trading to black smiths for a few basic materials
-// FIXME		if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) )
+        // FIXME		if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) )
-// FIXME		{
+        // FIXME		{
-// FIXME			// TODO: VILLAGER TRADING
+        // FIXME			// TODO: VILLAGER TRADING
-// FIXME			// VillagerRegistry.instance().getRegisteredVillagers().registerVillageTradeHandler( 3, new AETrading() );
+        // FIXME			// VillagerRegistry.instance().getRegisteredVillagers().registerVillageTradeHandler( 3, new AETrading() );
-// FIXME		}
+        // FIXME		}
 
         final IMovableRegistry mr = registries.movable();
 

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -73,22 +73,22 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         this.addNewAttunement(blocks.energyCell(), TunnelType.FE_POWER);
         this.addNewAttunement(blocks.energyCellCreative(), TunnelType.FE_POWER);
 
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER );
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER );
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER );
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER );
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER );
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER );
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER );
 
         /**
          * EU tunnel items
          */
 
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable
+        // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable
+        // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable
+        // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable
+        // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable
+        // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable
 
         /**
          * attune based on most redstone base items.
@@ -115,15 +115,15 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         this.addNewAttunement(new ItemStack(Blocks.HOPPER), TunnelType.ITEM);
         this.addNewAttunement(new ItemStack(Blocks.CHEST), TunnelType.ITEM);
         this.addNewAttunement(new ItemStack(Blocks.TRAPPED_CHEST), TunnelType.ITEM);
-// FIXME		this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM );
+        // FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM );
-// FIXME		this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM );
+        // FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
-// FIXME																										// (opaque)
+        // FIXME 																								// (opaque)
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
-// FIXME																										// itemduct
+        // FIXME 																								// itemduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
-// FIXME																										// itemduct
+        // FIXME 																								// itemduct
         // (opaque)
 
         /**
@@ -133,18 +133,18 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         this.addNewAttunement(new ItemStack(Items.LAVA_BUCKET), TunnelType.FLUID);
         this.addNewAttunement(new ItemStack(Items.MILK_BUCKET), TunnelType.FLUID);
         this.addNewAttunement(new ItemStack(Items.WATER_BUCKET), TunnelType.FLUID);
-// FIXME		this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID );
+        // FIXME this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID );
-// FIXME		this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID );
+        // FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID );
-// FIXME		this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID );
+        // FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// (opaque)
+        // FIXME 																								// (opaque)
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// hardened
+        // FIXME 																								// hardened
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// hardened
+        // FIXME 																								// hardened
-// FIXME																										// (opaque)
+        // FIXME 																								// (opaque)
-// FIXME
+        // FIXME
         for (final AEColor c : AEColor.values()) {
             this.addNewAttunement(parts.cableGlass().stack(c, 1), TunnelType.ME);
             this.addNewAttunement(parts.cableCovered().stack(c, 1), TunnelType.ME);

src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java

@@ -106,37 +106,37 @@ class GrinderRecipeCategory implements IRecipeCategory<GrinderRecipe> {
         ingredients.setOutputs(VanillaTypes.ITEM, outputs);
     }
 
-// FIXME USE SPECIAL INGREDIENT TYPE
+    // FIXME USE SPECIAL INGREDIENT TYPE
-// FIXME	@Override
+    // FIXME	@Override
-// FIXME	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY )
+    // FIXME	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY )
-// FIXME	{
+    // FIXME	{
-// FIXME
+    // FIXME
-// FIXME		FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
+    // FIXME		FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
-// FIXME
+    // FIXME
-// FIXME		int x = 118;
+    // FIXME		int x = 118;
-// FIXME
+    // FIXME
-// FIXME		final float scale = 0.85f;
+    // FIXME		final float scale = 0.85f;
-// FIXME		final float invScale = 1 / scale;
+    // FIXME		final float invScale = 1 / scale;
-// FIXME		GlStateManager.scale( scale, scale, 1 );
+    // FIXME		GlStateManager.scale( scale, scale, 1 );
-// FIXME
+    // FIXME
-// FIXME		if( this.recipe.getOptionalOutput() != null )
+    // FIXME		if( this.recipe.getOptionalOutput() != null )
-// FIXME		{
+    // FIXME		{
-// FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) );
+    // FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) );
-// FIXME			float width = fr.getStringWidth( text ) * scale;
+    // FIXME			float width = fr.getStringWidth( text ) * scale;
-// FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
+    // FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
-// FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
+    // FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
-// FIXME			x += 18;
+    // FIXME			x += 18;
-// FIXME		}
+    // FIXME		}
-// FIXME
+    // FIXME
-// FIXME		if( this.recipe.getSecondOptionalOutput() != null )
+    // FIXME		if( this.recipe.getSecondOptionalOutput() != null )
-// FIXME		{
+    // FIXME		{
-// FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) );
+    // FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) );
-// FIXME			float width = fr.getStringWidth( text ) * scale;
+    // FIXME			float width = fr.getStringWidth( text ) * scale;
-// FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
+    // FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
-// FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
+    // FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
-// FIXME		}
+    // FIXME		}
-// FIXME
+    // FIXME
-// FIXME		GlStateManager.scale( invScale, invScale, 1 );
+    // FIXME		GlStateManager.scale( invScale, invScale, 1 );
-// FIXME	}
+    // FIXME	}
 
 }

src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java

@@ -47,7 +47,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
 
     public AEBasePoweredItem(final DoubleSupplier powerCapacity, Properties props) {
         super(props);
-// FIXME this.setFull3D();
+        // FIXME this.setFull3D();
 
         this.powerCapacity = powerCapacity;
     }

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