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

README.md

@@ -25,9 +25,9 @@ A Mod about Matter, Energy and using them to conquer the world..
 ## Contacts
 
 * [Website](http://ae-mod.info/)
-* [Discord](https://discord.gg/GygKjjm)
-* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
 * [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
+* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
+* [Discord](https://discord.gg/GygKjjm)
 
 ## License
 
@@ -38,7 +38,7 @@ A Mod about Matter, Energy and using them to conquer the world..
   - (c) 2013 - 2020 AlgorithmX2 et al
   - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
 * Textures and Models
-  - (c) 2020, [Ridanisaurus Rid](https://github.com/Ridanisaurus/), (c) 2013 - 2020 AlgorithmX2 et al
+  - (c) 2013 - 2020 AlgorithmX2 et al
   - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 * Text and Translations
   - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
@@ -185,5 +185,4 @@ Thanks to
 * Notch et al for Minecraft
 * Lex et al for MinecraftForge
 * AlgorithmX2 for AppliedEnergistics2
-* [Ridanisaurus Rid](https://github.com/Ridanisaurus/) for the new 2020 textures
 * all [contributors](https://github.com/AppliedEnergistics/Applied-Energistics-2/graphs/contributors)

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/block/networking/EnergyCellBlock.java

@@ -35,9 +35,7 @@ import appeng.tile.networking.EnergyCellTileEntity;
 
 public class EnergyCellBlock extends AEBaseTileBlock<EnergyCellTileEntity> {
 
-    public static final int MAX_FULLNESS = 4;
-
-    public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, MAX_FULLNESS);
+    public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, 7);
 
     public EnergyCellBlock() {
         super(defaultProps(AEMaterials.GLASS));

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	if( player != null )
-//	FIXME	{
-//	FIXME		final AEColor col = player.myColor;
-//	FIXME		final float r = 0xff & ( col.mediumVariant >> 16 );
-//	FIXME		final float g = 0xff & ( col.mediumVariant >> 8 );
-//	FIXME		final float b = 0xff & ( col.mediumVariant );
-//	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	}
+        //	FIXME	final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() );
+        //	FIXME	if( player != null )
+        //	FIXME	{
+        //	FIXME		final AEColor col = player.myColor;
+        //	FIXME		final float r = 0xff & ( col.mediumVariant >> 16 );
+        //	FIXME		final float g = 0xff & ( col.mediumVariant >> 8 );
+        //	FIXME		final float b = 0xff & ( col.mediumVariant );
+        //	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	}
     }
 
     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
-                                                                                    // ItemRenderer.renderItemOverlayIntoGUI
+        TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from 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 offY *= 0.001;
-//				FIXME offZ *= 0.001;
+                // FIXME offX *= 0.001;
+                // FIXME offY *= 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 offY = 0;
-//				FIXME offZ = 0;
+                // FIXME offX = 0;
+                // FIXME offY = 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		if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) )
-// FIXME		{
-// FIXME			// TODO: VILLAGER TRADING
-// FIXME			// VillagerRegistry.instance().getRegisteredVillagers().registerVillageTradeHandler( 3, new AETrading() );
-// FIXME		}
+        // FIXME		// add villager trading to black smiths for a few basic materials
+        // FIXME		if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) )
+        // FIXME		{
+        // FIXME			// TODO: VILLAGER TRADING
+        // FIXME			// VillagerRegistry.instance().getRegisteredVillagers().registerVillageTradeHandler( 3, new AETrading() );
+        // 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", 1 ), 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", 4 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), 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", 2 ), 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", 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", 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", 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", 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", 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", 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( "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", 1 ), TunnelType.ITEM ); // itemduct
-// FIXME																										// (opaque)
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
-// FIXME																										// itemduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
-// FIXME																										// itemduct
+        // 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( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
+        // FIXME 																								// (opaque)
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
+        // FIXME 																								// itemduct
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
+        // 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", "parttransmitter", 4 ), 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", 1 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// (opaque)
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// hardened
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// hardened
-// FIXME																										// (opaque)
-// FIXME
+        // 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( "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", 1 ), TunnelType.FLUID ); // fluiduct
+        // FIXME 																								// (opaque)
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
+        // FIXME 																								// hardened
+        // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
+        // FIXME 																								// hardened
+        // FIXME 																								// (opaque)
+        // 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	@Override
-// FIXME	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY )
-// FIXME	{
-// FIXME
-// FIXME		FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
-// FIXME
-// FIXME		int x = 118;
-// FIXME
-// FIXME		final float scale = 0.85f;
-// FIXME		final float invScale = 1 / scale;
-// FIXME		GlStateManager.scale( scale, scale, 1 );
-// FIXME
-// FIXME		if( this.recipe.getOptionalOutput() != null )
-// FIXME		{
-// FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) );
-// FIXME			float width = fr.getStringWidth( text ) * scale;
-// FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
-// FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
-// FIXME			x += 18;
-// FIXME		}
-// FIXME
-// FIXME		if( this.recipe.getSecondOptionalOutput() != null )
-// FIXME		{
-// FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) );
-// FIXME			float width = fr.getStringWidth( text ) * scale;
-// FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
-// FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
-// FIXME		}
-// FIXME
-// FIXME		GlStateManager.scale( invScale, invScale, 1 );
-// FIXME	}
+    // FIXME USE SPECIAL INGREDIENT TYPE
+    // FIXME	@Override
+    // FIXME	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY )
+    // FIXME	{
+    // FIXME
+    // FIXME		FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
+    // FIXME
+    // FIXME		int x = 118;
+    // FIXME
+    // FIXME		final float scale = 0.85f;
+    // FIXME		final float invScale = 1 / scale;
+    // FIXME		GlStateManager.scale( scale, scale, 1 );
+    // FIXME
+    // FIXME		if( this.recipe.getOptionalOutput() != null )
+    // FIXME		{
+    // FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) );
+    // FIXME			float width = fr.getStringWidth( text ) * scale;
+    // FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
+    // FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
+    // FIXME			x += 18;
+    // FIXME		}
+    // FIXME
+    // FIXME		if( this.recipe.getSecondOptionalOutput() != null )
+    // FIXME		{
+    // FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) );
+    // FIXME			float width = fr.getStringWidth( text ) * scale;
+    // FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
+    // FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
+    // FIXME		}
+    // FIXME
+    // FIXME		GlStateManager.scale( invScale, invScale, 1 );
+    // 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/tile/networking/EnergyCellTileEntity.java

@@ -21,7 +21,6 @@ package appeng.tile.networking;
 import net.minecraft.block.BlockState;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.math.MathHelper;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -68,9 +67,15 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe
      * block. This is also used for determining the item model.
      */
     public static int getStorageLevelFromFillFactor(double fillFactor) {
-        byte factor = (byte) (8.0 * (fillFactor));
+        byte boundMetadata = (byte) (8.0 * (fillFactor));
 
-        return MathHelper.clamp(factor, 0, EnergyCellBlock.MAX_FULLNESS);
+        if (boundMetadata > 7) {
+            boundMetadata = 7;
+        }
+        if (boundMetadata < 0) {
+            boundMetadata = 0;
+        }
+        return boundMetadata;
     }
 
     private void changePowerLevel() {

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,
-                            sh) /* FIXME || ae_req.sameOre( x ) */ ) && !ItemStack.areItemsEqual(sh, output)) { // Platform.isSameItemType(
-                                                                                                                // sh,
-                                                                                                                // providedTemplate
-                                                                                                                // )
+                    if ((Platform.itemComparisons().isEqualItemType(providedTemplate, sh))
+                            && !ItemStack.areItemsEqual(sh, output)) {
                         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);
     }

src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json

@@ -1,15 +1,7 @@
 {
   "variants": {
-    "": [
-      {
-        "model": "appliedenergistics2:block/charged_quartz_ore_0",
-        "weight": 1
-      },
-      {
-        "model": "appliedenergistics2:block/charged_quartz_ore_1",
-        "weight": 1
-      },
-      { "model": "appliedenergistics2:block/charged_quartz_ore_2", "weight": 1 }
-    ]
+    "": {
+      "model": "appliedenergistics2:block/charged_quartz_ore"
+    }
   }
 }

src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json

@@ -1,19 +1,28 @@
 {
   "variants": {
     "fullness=0": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_0"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell0"
     },
     "fullness=1": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1"
     },
     "fullness=2": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2"
     },
     "fullness=3": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3"
     },
     "fullness=4": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4"
+    },
+    "fullness=5": {
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5"
+    },
+    "fullness=6": {
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6"
+    },
+    "fullness=7": {
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7"
     }
   }
 }

src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json

@@ -1,19 +1,28 @@
 {
   "variants": {
     "fullness=0": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_0"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell0"
     },
     "fullness=1": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_1"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell1"
     },
     "fullness=2": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_2"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell2"
     },
     "fullness=3": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_3"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell3"
     },
     "fullness=4": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_4"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell4"
+    },
+    "fullness=5": {
+      "model": "appliedenergistics2:block/energy_cell/energy_cell5"
+    },
+    "fullness=6": {
+      "model": "appliedenergistics2:block/energy_cell/energy_cell6"
+    },
+    "fullness=7": {
+      "model": "appliedenergistics2:block/energy_cell/energy_cell7"
     }
   }
 }

src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "": [
-      { "model": "appliedenergistics2:block/quartz_ore_0", "weight": 1 },
-      { "model": "appliedenergistics2:block/quartz_ore_1", "weight": 1 },
-      { "model": "appliedenergistics2:block/quartz_ore_2", "weight": 1 },
-      { "model": "appliedenergistics2:block/quartz_ore_3", "weight": 1 }
-    ]
+    "": {
+      "model": "appliedenergistics2:block/quartz_ore"
+    }
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json

@@ -2,7 +2,7 @@
   "parent": "block/block",
   "textures": {
     "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_0",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light",
     "particle": "appliedenergistics2:block/charged_quartz_ore"
   },
   "elements": [

src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json

@@ -1,77 +0,0 @@
-{
-  "parent": "block/block",
-  "textures": {
-    "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_1",
-    "particle": "appliedenergistics2:block/charged_quartz_ore"
-  },
-  "elements": [
-    {
-      "faces": {
-        "down": {
-          "texture": "#block",
-          "cullface": "down"
-        },
-        "east": {
-          "texture": "#block",
-          "cullface": "east"
-        },
-        "north": {
-          "texture": "#block",
-          "cullface": "north"
-        },
-        "south": {
-          "texture": "#block",
-          "cullface": "south"
-        },
-        "up": {
-          "texture": "#block",
-          "cullface": "up"
-        },
-        "west": {
-          "texture": "#block",
-          "cullface": "west"
-        }
-      },
-      "from": [0, 0, 0],
-      "to": [16, 16, 16]
-    },
-    {
-      "faces": {
-        "down": {
-          "texture": "#quartz",
-          "cullface": "down",
-          "unlit": true
-        },
-        "east": {
-          "texture": "#quartz",
-          "cullface": "east",
-          "unlit": true
-        },
-        "north": {
-          "texture": "#quartz",
-          "cullface": "north",
-          "unlit": true
-        },
-        "south": {
-          "texture": "#quartz",
-          "cullface": "south",
-          "unlit": true
-        },
-        "up": {
-          "texture": "#quartz",
-          "cullface": "up",
-          "unlit": true
-        },
-        "west": {
-          "texture": "#quartz",
-          "cullface": "west",
-          "unlit": true
-        }
-      },
-      "from": [0, 0, 0],
-      "shade": true,
-      "to": [16, 16, 16]
-    }
-  ]
-}

src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json

@@ -1,77 +0,0 @@
-{
-  "parent": "block/block",
-  "textures": {
-    "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_2",
-    "particle": "appliedenergistics2:block/charged_quartz_ore"
-  },
-  "elements": [
-    {
-      "faces": {
-        "down": {
-          "texture": "#block",
-          "cullface": "down"
-        },
-        "east": {
-          "texture": "#block",
-          "cullface": "east"
-        },
-        "north": {
-          "texture": "#block",
-          "cullface": "north"
-        },
-        "south": {
-          "texture": "#block",
-          "cullface": "south"
-        },
-        "up": {
-          "texture": "#block",
-          "cullface": "up"
-        },
-        "west": {
-          "texture": "#block",
-          "cullface": "west"
-        }
-      },
-      "from": [0, 0, 0],
-      "to": [16, 16, 16]
-    },
-    {
-      "faces": {
-        "down": {
-          "texture": "#quartz",
-          "cullface": "down",
-          "unlit": true
-        },
-        "east": {
-          "texture": "#quartz",
-          "cullface": "east",
-          "unlit": true
-        },
-        "north": {
-          "texture": "#quartz",
-          "cullface": "north",
-          "unlit": true
-        },
-        "south": {
-          "texture": "#quartz",
-          "cullface": "south",
-          "unlit": true
-        },
-        "up": {
-          "texture": "#quartz",
-          "cullface": "up",
-          "unlit": true
-        },
-        "west": {
-          "texture": "#quartz",
-          "cullface": "west",
-          "unlit": true
-        }
-      },
-      "from": [0, 0, 0],
-      "shade": true,
-      "to": [16, 16, 16]
-    }
-  ]
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell0"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell1"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell2"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell3"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell4"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell5"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell6"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell7"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell_0"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell_1"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell_2"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell_3"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell_4"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell_5"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/quartz_ore_0"
+    "all": "appliedenergistics2:block/energy_cell0"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/quartz_ore_1"
+    "all": "appliedenergistics2:block/energy_cell1"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/quartz_ore_2"
+    "all": "appliedenergistics2:block/energy_cell2"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/quartz_ore_3"
+    "all": "appliedenergistics2:block/energy_cell3"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell4"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell5"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell6"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell7"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell_0"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell_1"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell_2"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell_3"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell_4"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell_5"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/inscriber.json

@@ -1,10 +1,9 @@
 {
-  "credit": "Made with Blockbench",
   "parent": "block/orientable",
   "textures": {
-    "inside": "appliedenergistics2:block/inscriber_internal",
     "particle": "appliedenergistics2:block/inscriber",
-    "side": "appliedenergistics2:block/inscriber"
+    "side": "appliedenergistics2:block/inscriber",
+    "inside": "appliedenergistics2:block/inscriber_inside"
   },
   "elements": [
     {
@@ -12,11 +11,26 @@
       "from": [1, 0, 1],
       "to": [15, 1, 15],
       "faces": {
-        "north": { "uv": [1, 15, 15, 16], "texture": "#side" },
-        "east": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        "south": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        "west": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        "down": { "uv": [1, 1, 15, 15], "texture": "#side" }
+        "down": {
+          "texture": "#side",
+          "uv": [1, 1, 15, 15]
+        },
+        "east": {
+          "texture": "#side",
+          "uv": [1, 0, 15, 1]
+        },
+        "north": {
+          "texture": "#side",
+          "uv": [1, 15, 15, 16]
+        },
+        "south": {
+          "texture": "#side",
+          "uv": [1, 0, 15, 1]
+        },
+        "west": {
+          "texture": "#side",
+          "uv": [1, 0, 15, 1]
+        }
       }
     },
     {
@@ -24,11 +38,26 @@
       "from": [1, 15, 1],
       "to": [15, 16, 15],
       "faces": {
-        "north": { "uv": [1, 15, 15, 16], "texture": "#side" },
-        "east": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        "south": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        "west": { "uv": [1, 15, 15, 16], "texture": "#side" },
-        "up": { "uv": [1, 1, 15, 15], "texture": "#side" }
+        "east": {
+          "texture": "#side",
+          "uv": [1, 0, 15, 1]
+        },
+        "north": {
+          "texture": "#side",
+          "uv": [1, 15, 15, 16]
+        },
+        "south": {
+          "texture": "#side",
+          "uv": [1, 0, 15, 1]
+        },
+        "up": {
+          "texture": "#side",
+          "uv": [1, 1, 15, 15]
+        },
+        "west": {
+          "texture": "#side",
+          "uv": [1, 15, 15, 16]
+        }
       }
     },
     {
@@ -36,12 +65,30 @@
       "from": [0, 1, 0],
       "to": [3, 15, 16],
       "faces": {
-        "north": { "uv": [13, 1, 16, 15], "texture": "#side" },
-        "east": { "uv": [0, 1, 16, 15], "texture": "#inside" },
-        "south": { "uv": [0, 1, 3, 15], "texture": "#side" },
-        "west": { "uv": [0, 1, 16, 15], "texture": "#side" },
-        "up": { "uv": [0, 0, 3, 16], "texture": "#side" },
-        "down": { "uv": [0, 0, 3, 16], "texture": "#side" }
+        "down": {
+          "texture": "#side",
+          "uv": [0, 1, 3, 15]
+        },
+        "east": {
+          "texture": "#side",
+          "uv": [0, 1, 16, 15]
+        },
+        "north": {
+          "texture": "#side",
+          "uv": [13, 1, 16, 15]
+        },
+        "south": {
+          "texture": "#side",
+          "uv": [0, 1, 3, 15]
+        },
+        "up": {
+          "texture": "#side",
+          "uv": [0, 0, 3, 6]
+        },
+        "west": {
+          "texture": "#side",
+          "uv": [0, 1, 16, 15]
+        }
       }
     },
     {
@@ -49,12 +96,30 @@
       "from": [13, 1, 0],
       "to": [16, 15, 16],
       "faces": {
-        "north": { "uv": [0, 1, 3, 15], "texture": "#side" },
-        "east": { "uv": [0, 1, 16, 15], "texture": "#side" },
-        "south": { "uv": [13, 1, 16, 15], "texture": "#side" },
-        "west": { "uv": [0, 1, 16, 15], "texture": "#inside" },
-        "up": { "uv": [13, 0, 16, 16], "texture": "#side" },
-        "down": { "uv": [0, 0, 3, 16], "rotation": 180, "texture": "#side" }
+        "down": {
+          "texture": "#side",
+          "uv": [0, 1, 3, 15]
+        },
+        "east": {
+          "texture": "#side",
+          "uv": [0, 1, 16, 15]
+        },
+        "north": {
+          "texture": "#side",
+          "uv": [0, 1, 3, 15]
+        },
+        "south": {
+          "texture": "#side",
+          "uv": [13, 1, 16, 15]
+        },
+        "up": {
+          "texture": "#side",
+          "uv": [13, 1, 16, 15]
+        },
+        "west": {
+          "texture": "#side",
+          "uv": [0, 1, 16, 15]
+        }
       }
     },
     {
@@ -62,10 +127,22 @@
       "from": [3, 1, 13],
       "to": [13, 15, 16],
       "faces": {
-        "north": { "uv": [3, 1, 13, 15], "texture": "#inside" },
-        "south": { "uv": [3, 1, 13, 15], "texture": "#side" },
-        "up": { "uv": [3, 0, 13, 3], "rotation": 180, "texture": "#side" },
-        "down": { "uv": [3, 13, 13, 16], "rotation": 180, "texture": "#side" }
+        "down": {
+          "texture": "#side",
+          "uv": [3, 0, 13, 3]
+        },
+        "north": {
+          "texture": "#side",
+          "uv": [3, 1, 13, 15]
+        },
+        "south": {
+          "texture": "#side",
+          "uv": [3, 1, 13, 15]
+        },
+        "up": {
+          "texture": "#side",
+          "uv": [3, 0, 13, 3]
+        }
       }
     },
     {
@@ -73,8 +150,14 @@
       "from": [3, 1, 1],
       "to": [13, 4, 13],
       "faces": {
-        "north": { "uv": [3, 13, 13, 16], "texture": "#side" },
-        "up": { "uv": [3, 2, 13, 14], "texture": "#inside" }
+        "north": {
+          "texture": "#side",
+          "uv": [3, 12, 13, 15]
+        },
+        "up": {
+          "texture": "#side",
+          "uv": [3, 1, 13, 13]
+        }
       }
     },
     {
@@ -82,8 +165,14 @@
       "from": [3, 12, 1],
       "to": [13, 15, 11],
       "faces": {
-        "north": { "uv": [3, 0, 13, 3], "texture": "#side" },
-        "down": { "uv": [3, 3, 13, 13], "texture": "#inside" }
+        "down": {
+          "texture": "#side",
+          "uv": [3, 1, 13, 11]
+        },
+        "north": {
+          "texture": "#side",
+          "uv": [3, 1, 13, 4]
+        }
       }
     }
   ]

src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/quartz_ore"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json

@@ -1,29 +1,47 @@
 {
-  "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell_0",
+  "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell0",
   "overrides": [
     {
       "predicate": {
-        "appliedenergistics2:fill_level": 0
+        "appliedenergistics2:fill_level": 0.125
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.25
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2"
+    },
+    {
+      "predicate": {
+        "appliedenergistics2:fill_level": 0.375
+      },
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.5
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4"
+    },
+    {
+      "predicate": {
+        "appliedenergistics2:fill_level": 0.625
+      },
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.75
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6"
+    },
+    {
+      "predicate": {
+        "appliedenergistics2:fill_level": 0.875
+      },
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7"
     }
   ]
 }

src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json

@@ -1,29 +1,47 @@
 {
-  "parent": "appliedenergistics2:block/energy_cell/energy_cell_0",
+  "parent": "appliedenergistics2:block/energy_cell/energy_cell0",
   "overrides": [
     {
       "predicate": {
-        "appliedenergistics2:fill_level": 0
+        "appliedenergistics2:fill_level": 0.125
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_1"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell1"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.25
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_2"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell2"
+    },
+    {
+      "predicate": {
+        "appliedenergistics2:fill_level": 0.375
+      },
+      "model": "appliedenergistics2:block/energy_cell/energy_cell3"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.5
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_3"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell4"
+    },
+    {
+      "predicate": {
+        "appliedenergistics2:fill_level": 0.625
+      },
+      "model": "appliedenergistics2:block/energy_cell/energy_cell5"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.75
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell_4"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell6"
+    },
+    {
+      "predicate": {
+        "appliedenergistics2:fill_level": 0.875
+      },
+      "model": "appliedenergistics2:block/energy_cell/energy_cell7"
     }
   ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_p2p_tunnel.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:item/p2p_tunnel_base",
   "textures": {
-    "type": "appliedenergistics2:block/fluid_interface"
+    "type": "block/lapis_block"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json

@@ -1,6 +1,3 @@
 {
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/quartz_ore_0"
-  }
+  "parent": "appliedenergistics2:block/quartz_ore"
 }

src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fluids.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:part/p2p/p2p_tunnel_base",
   "textures": {
-    "type": "appliedenergistics2:block/fluid_interface"
+    "type": "block/lapis_block"
   }
 }

src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta

@@ -1,49 +0,0 @@
- {
-  "animation": {
-  "interpolate": true,
-  	"frames": [
-  		{
-  			"index": 0,
-  			"time": 25
-  		},
-  		{
-  			"index": 1,
-  			"time": 2
-  		},
-  		{
-  			"index": 2,
-  			"time": 2
-  		},
-  		{
-  			"index": 3,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 4,
-  			"time": 2
-  		},
-  		{
-  			"index": 5,
-  			"time": 2
-  		},
-  		{
-  			"index": 6,
-  			"time": 2
-  		},
-  		{
-  			"index": 7,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 8,
-  			"time": 2
-  		},
-  		{
-  			"index": 9,
-  			"time": 2
-  		}
-  	]
-  }  
-}

src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta

@@ -1,49 +0,0 @@
- {
-  "animation": {
-  "interpolate": true,
-  	"frames": [
-  		{
-  			"index": 0,
-  			"time": 2
-  		},
-  		{
-  			"index": 1,
-  			"time": 2
-  		},
-  		{
-  			"index": 2,
-  			"time": 2
-  		},
-  		{
-  			"index": 3,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 4,
-  			"time": 2
-  		},
-  		{
-  			"index": 5,
-  			"time": 2
-  		},
-  		{
-  			"index": 6,
-  			"time": 2
-  		},
-  		{
-  			"index": 7,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 8,
-  			"time": 25
-  		},
-  		{
-  			"index": 9,
-  			"time": 2
-  		}
-  	]
-  }  
-}

src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta

@@ -1,49 +0,0 @@
- {
-  "animation": {
-  "interpolate": true,
-  	"frames": [
-  		{
-  			"index": 0,
-  			"time": 2
-  		},
-  		{
-  			"index": 1,
-  			"time": 2
-  		},
-  		{
-  			"index": 2,
-  			"time": 25
-  		},
-  		{
-  			"index": 3,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 4,
-  			"time": 2
-  		},
-  		{
-  			"index": 5,
-  			"time": 2
-  		},
-  		{
-  			"index": 6,
-  			"time": 2
-  		},
-  		{
-  			"index": 7,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 8,
-  			"time": 2
-  		},
-  		{
-  			"index": 9,
-  			"time": 2
-  		}
-  	]
-  }  
-}

src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta

@@ -1,6 +1,6 @@
 {
   "animation": {
-    "frametime": 2,
+    "frametime": 3,
     "frames": [
       1,
       2,

src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta

@@ -1,6 +1,6 @@
 {
   "animation": {
-    "frametime": 2,
+    "frametime": 3,
     "frames": [
       0,
       1,