Make the project buildable with gradlew build by externalizing the model generator and expose it as an interface

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

@@ -1,4 +1,3 @@
-
 package appeng.client.render;
 
 
@@ -28,17 +27,17 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.client.model.IColoredBakedQuad;
 
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.client.texture.BaseIcon;
-import appeng.client.texture.IAESprite;
 import appeng.client.texture.MissingIcon;
 import appeng.items.AEBaseItem;
 import appeng.items.parts.ItemMultiPart;
 
 
-public class ModelGenerator
+public class BakingModelGenerator implements ModelGenerator
 {
-
 	private static final class CachedModel implements IBakedModel
 	{
 		private final List<BakedQuad>[] faces = new List[6];
@@ -96,6 +95,7 @@ public class ModelGenerator
 		}
 	}
 
+
 	private int uvRotateBottom;
 	private int uvRotateEast;
 	private int uvRotateNorth;
@@ -175,21 +175,21 @@ public class ModelGenerator
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		whiteVariant;
+			whiteVariant;
 	}
 
 	public void setColorOpaque( final int r, final int g, final int b )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		r << 16 | g << 8 | b;
+			r << 16 | g << 8 | b;
 	}
 
 	public void setColorOpaque_F( final int r, final int g, final int b )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
+			Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
 	}
 
 	public void setColorOpaque_F( final float rf, final float bf, final float gf )
@@ -199,7 +199,7 @@ public class ModelGenerator
 		final int b = (int) ( bf * 0xff );
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
+			Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
 	}
 
 	public IAESprite getIcon( final ItemStack is )
@@ -298,13 +298,39 @@ public class ModelGenerator
 		if( this.point == 4 )
 		{
 			this.brightness = -1;
-			final int[] vertData = { Float.floatToRawIntBits( this.points[0][0] ), Float.floatToRawIntBits( this.points[0][1] ), Float.floatToRawIntBits( this.points[0][2] ), this.brightness, Float.floatToRawIntBits( this.points[0][3] ), Float.floatToRawIntBits( this.points[0][4] ), 0,
+			final int[] vertData = {
+				Float.floatToRawIntBits( this.points[0][0] ),
+				Float.floatToRawIntBits( this.points[0][1] ),
+				Float.floatToRawIntBits( this.points[0][2] ),
+				this.brightness,
+				Float.floatToRawIntBits( this.points[0][3] ),
+				Float.floatToRawIntBits( this.points[0][4] ),
+				0,
 
-			Float.floatToRawIntBits( this.points[1][0] ), Float.floatToRawIntBits( this.points[1][1] ), Float.floatToRawIntBits( this.points[1][2] ), this.brightness, Float.floatToRawIntBits( this.points[1][3] ), Float.floatToRawIntBits( this.points[1][4] ), 0,
+				Float.floatToRawIntBits( this.points[1][0] ),
+				Float.floatToRawIntBits( this.points[1][1] ),
+				Float.floatToRawIntBits( this.points[1][2] ),
+				this.brightness,
+				Float.floatToRawIntBits( this.points[1][3] ),
+				Float.floatToRawIntBits( this.points[1][4] ),
+				0,
 
-			Float.floatToRawIntBits( this.points[2][0] ), Float.floatToRawIntBits( this.points[2][1] ), Float.floatToRawIntBits( this.points[2][2] ), this.brightness, Float.floatToRawIntBits( this.points[2][3] ), Float.floatToRawIntBits( this.points[2][4] ), 0,
+				Float.floatToRawIntBits( this.points[2][0] ),
+				Float.floatToRawIntBits( this.points[2][1] ),
+				Float.floatToRawIntBits( this.points[2][2] ),
+				this.brightness,
+				Float.floatToRawIntBits( this.points[2][3] ),
+				Float.floatToRawIntBits( this.points[2][4] ),
+				0,
 
-			Float.floatToRawIntBits( this.points[3][0] ), Float.floatToRawIntBits( this.points[3][1] ), Float.floatToRawIntBits( this.points[3][2] ), this.brightness, Float.floatToRawIntBits( this.points[3][3] ), Float.floatToRawIntBits( this.points[3][4] ), 0, };
+				Float.floatToRawIntBits( this.points[3][0] ),
+				Float.floatToRawIntBits( this.points[3][1] ),
+				Float.floatToRawIntBits( this.points[3][2] ),
+				this.brightness,
+				Float.floatToRawIntBits( this.points[3][3] ),
+				Float.floatToRawIntBits( this.points[3][4] ),
+				0,
+				};
 
 			this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) );
 
@@ -395,17 +421,17 @@ public class ModelGenerator
 		to_b = 1.0f - to_b;
 
 		final float[] afloat = {// :P
-		16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0
-		16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1
+		                        16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0
+		                        16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1
 
-		16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2
-		16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3
+		                        16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2
+		                        16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3
 
-		16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2
-		16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3
+		                        16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2
+		                        16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3
 
-		16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0
-		16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1
+		                        16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0
+		                        16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1
 		};
 
 		return afloat;
@@ -720,5 +746,4 @@ public class ModelGenerator
 	{
 		this.renderFaces = renderFaces;
 	}
-
 }

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

@@ -21,7 +21,6 @@ package appeng.client.render;
 
 import java.nio.FloatBuffer;
 import java.util.EnumSet;
-
 import javax.annotation.Nullable;
 
 import org.lwjgl.BufferUtils;
@@ -43,10 +42,11 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
 import appeng.api.util.IOrientable;
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.core.AppEng;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;

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

@@ -20,8 +20,8 @@ package appeng.client.render;
 
 
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
 import appeng.client.texture.FlippableIcon;
-import appeng.client.texture.IAESprite;
 import appeng.client.texture.TmpFlippableIcon;
 
 

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

@@ -20,7 +20,6 @@ package appeng.client.render;
 
 
 import java.util.EnumSet;
-
 import javax.annotation.Nullable;
 
 import com.google.common.base.Function;
@@ -37,8 +36,9 @@ import appeng.api.exceptions.MissingDefinition;
 import appeng.api.parts.IPartCollisionHelper;
 import appeng.api.parts.IPartRenderHelper;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
-import appeng.client.texture.IAESprite;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.tile.AEBaseTile;

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

@@ -19,6 +19,9 @@
 package appeng.client.render;
 
 
+import appeng.api.util.ModelGenerator;
+
+
 public class BusRenderer
 {
 

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

@@ -34,6 +34,7 @@ import appeng.api.parts.IFacadePart;
 import appeng.api.parts.IPart;
 import appeng.api.util.AEAxisAlignedBB;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.ModelGenerator;
 import appeng.parts.BusCollisionHelper;
 import appeng.parts.CableBusContainer;
 

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

@@ -6,12 +6,12 @@ import net.minecraft.block.Block;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
+
 
 public interface ISimpleBlockRenderingHandler
 {
-
 	void renderInventoryBlock( Block block, int metadata, int modelID, ModelGenerator renderer );
 
 	boolean renderWorldBlock( IBlockAccess world, BlockPos pos, Block block, int modelId, ModelGenerator renderer );
-
 }

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

@@ -4,7 +4,7 @@ package appeng.client.render;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 
-import appeng.client.texture.IAESprite;
+import appeng.api.util.IAESprite;
 
 
 public class IconUnwrapper extends TextureAtlasSprite

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

@@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 @SideOnly( Side.CLIENT )
-public class RenderBlocksWorkaround extends ModelGenerator
+public class RenderBlocksWorkaround extends BakingModelGenerator
 {
 
 	private boolean flipTexture;

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

@@ -28,6 +28,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.core.AELog;
 import appeng.tile.AEBaseTile;
@@ -37,7 +38,7 @@ import appeng.tile.AEBaseTile;
 public class TESRWrapper extends TileEntitySpecialRenderer
 {
 
-	private final ModelGenerator renderBlocksInstance = new ModelGenerator();
+	private final ModelGenerator renderBlocksInstance = new BakingModelGenerator();
 	private final BaseBlockRender blkRender;
 	private final double maxDistance;
 

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

@@ -28,6 +28,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.client.ItemRenderType;
 import appeng.core.AELog;
@@ -39,7 +40,7 @@ public final class WorldRender implements ISimpleBlockRenderingHandler
 
 	private static final WorldRender INSTANCE = new WorldRender();
 	private final HashMap<AEBaseBlock, BaseBlockRender> blockRenders = new HashMap<AEBaseBlock, BaseBlockRender>();
-	private final ModelGenerator renderer = new ModelGenerator();
+	private final ModelGenerator renderer = new BakingModelGenerator();
 	private boolean hasError = false;
 
 	private WorldRender()

src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java

@@ -33,14 +33,14 @@ import appeng.api.parts.IPart;
 import appeng.api.parts.IPartCollisionHelper;
 import appeng.api.parts.IPartHost;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
 import appeng.api.util.IOrientable;
+import appeng.api.util.ModelGenerator;
 import appeng.block.crafting.BlockMolecularAssembler;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderer;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.client.texture.TaughtIcon;
 import appeng.parts.networking.PartCable;
 import appeng.tile.crafting.TileMolecularAssembler;

src/main/java/appeng/client/render/blocks/RenderBlockCharger.java

@@ -34,10 +34,10 @@ import net.minecraft.world.IBlockAccess;
 
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IOrientable;
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockCharger;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AELog;
 import appeng.tile.misc.TileCharger;

src/main/java/appeng/client/render/blocks/RenderBlockController.java

@@ -24,10 +24,10 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.networking.BlockController;
 import appeng.block.networking.BlockController.ControllerBlockState;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.networking.TileController;
 

src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java

@@ -32,14 +32,14 @@ import net.minecraftforge.client.MinecraftForgeClient;
 import appeng.api.AEApi;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.crafting.BlockCraftingMonitor;
 import appeng.block.crafting.BlockCraftingUnit;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderHelper;
 import appeng.client.render.BusRenderer;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.crafting.TileCraftingMonitorTile;
 import appeng.tile.crafting.TileCraftingTile;
 

src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java

@@ -31,9 +31,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
 import appeng.api.storage.data.IAEItemStack;
+import appeng.api.util.ModelGenerator;
 import appeng.block.crafting.BlockCraftingMonitor;
 import appeng.client.ClientHelper;
-import appeng.client.render.ModelGenerator;
 import appeng.core.AELog;
 import appeng.tile.crafting.TileCraftingMonitorTile;
 import appeng.util.IWideReadableNumberConverter;

src/main/java/appeng/client/render/blocks/RenderBlockCrank.java

@@ -31,10 +31,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.grindstone.BlockCrank;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.tile.grindstone.TileCrank;
 
 

src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java

@@ -24,10 +24,10 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
 import appeng.api.implementations.items.IAEItemPowerStorage;
+import appeng.api.util.ModelGenerator;
 import appeng.block.networking.BlockEnergyCell;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.tile.networking.TileEnergyCell;
 
 

src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java

@@ -38,14 +38,14 @@ import net.minecraft.world.IBlockAccess;
 
 import appeng.api.features.IInscriberRecipe;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
 import appeng.api.util.IOrientable;
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.block.misc.BlockInscriber;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.core.AELog;
 import appeng.tile.AEBaseTile;
 import appeng.tile.misc.TileInscriber;

src/main/java/appeng/client/render/blocks/RenderBlockInterface.java

@@ -22,12 +22,12 @@ package appeng.client.render.blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockInterface;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.misc.TileInterface;
 
 

src/main/java/appeng/client/render/blocks/RenderBlockPaint.java

@@ -26,12 +26,12 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockPaint;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.helpers.Splotch;
 import appeng.tile.misc.TilePaint;
 

src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java

@@ -23,11 +23,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockQuartzGrowthAccelerator;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.misc.TileQuartzGrowthAccelerator;
 
 

src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java

@@ -31,11 +31,11 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.storage.BlockSkyChest;
 import appeng.block.storage.BlockSkyChest.SkyChestType;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.tile.storage.TileSkyChest;
 
 

src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java

@@ -30,10 +30,10 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockSkyCompass;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.render.model.ModelCompass;
 import appeng.hooks.CompassManager;
 import appeng.hooks.CompassResult;

src/main/java/appeng/client/render/blocks/RenderBlockWireless.java

@@ -28,14 +28,14 @@ import net.minecraft.world.IBlockAccess;
 
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.networking.BlockWireless;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.CableBusTextures;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.client.texture.OffsetIcon;
 import appeng.tile.networking.TileWireless;
 import appeng.util.Platform;

src/main/java/appeng/client/render/blocks/RenderDrive.java

@@ -27,12 +27,12 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.storage.BlockDrive;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.storage.TileDrive;
 import appeng.util.Platform;
 

src/main/java/appeng/client/render/blocks/RenderMEChest.java

@@ -30,13 +30,13 @@ import appeng.api.AEApi;
 import appeng.api.storage.ICellHandler;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.storage.BlockChest;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
 import appeng.client.texture.FlippableIcon;
-import appeng.client.texture.IAESprite;
 import appeng.client.texture.OffsetIcon;
 import appeng.tile.storage.TileChest;
 import appeng.util.Platform;

src/main/java/appeng/client/render/blocks/RenderNull.java

@@ -23,10 +23,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.tile.AEBaseTile;
 
 

src/main/java/appeng/client/render/blocks/RenderQNB.java

@@ -35,12 +35,12 @@ import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IParts;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.qnb.BlockQuantumBase;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.qnb.TileQuantumBridge;
 
 

src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java

@@ -27,9 +27,9 @@ import net.minecraft.world.IBlockAccess;
 
 import appeng.api.AEApi;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.ModelGenerator;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
 import appeng.client.texture.OffsetIcon;
 import appeng.decorative.solid.QuartzGlassBlock;

src/main/java/appeng/client/render/blocks/RenderQuartzOre.java

@@ -23,9 +23,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
 import appeng.decorative.solid.QuartzOreBlock;
 import appeng.tile.AEBaseTile;

src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java

@@ -29,10 +29,10 @@ import net.minecraft.world.IBlockAccess;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
+import appeng.api.util.ModelGenerator;
 import appeng.block.AEBaseBlock;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.tile.AEBaseTile;
 
 

src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java

@@ -25,13 +25,13 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.spatial.BlockSpatialPylon;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.spatial.TileSpatialPylon;
 
 

src/main/java/appeng/client/render/blocks/RenderTinyTNT.java

@@ -25,10 +25,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockTinyTNT;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.FullIcon;
 import appeng.tile.AEBaseTile;
 

src/main/java/appeng/client/render/blocks/RendererCableBus.java

@@ -33,13 +33,13 @@ import appeng.api.parts.IFacadePart;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartItem;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.ModelGenerator;
 import appeng.block.networking.BlockCableBus;
 import appeng.client.ClientHelper;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderHelper;
 import appeng.client.render.BusRenderer;
-import appeng.client.render.ModelGenerator;
 import appeng.facade.IFacadeItem;
 import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;

src/main/java/appeng/client/render/blocks/RendererSecurity.java

@@ -28,12 +28,12 @@ import net.minecraft.world.IBlockAccess;
 
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
+import appeng.api.util.IAESprite;
+import appeng.api.util.ModelGenerator;
 import appeng.block.misc.BlockSecurity;
 import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;
-import appeng.client.texture.IAESprite;
 import appeng.tile.misc.TileSecurity;