Custom Model Loader

src/main/java/appeng/block/AEBaseBlock.java

@@ -425,6 +425,7 @@ public abstract class AEBaseBlock extends Block
 		return null;
 	}
 
+	@Deprecated
 	protected IProperty[] getAEStates()
 	{
 		return new IProperty[0];

src/main/java/appeng/block/crafting/ItemCraftingStorage.java

@@ -39,7 +39,7 @@ public class ItemCraftingStorage extends AEBaseBlockItem
 	@Override
 	public ItemStack getContainerItem( final ItemStack itemStack )
 	{
-		return AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY );
+		return Api.INSTANCE.definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY );
 	}
 
 	@Override

src/main/java/appeng/block/misc/BlockCharger.java

@@ -111,7 +111,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 		{
 			final TileCharger tc = (TileCharger) tile;
 
-			if( AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getInternalInventory().getStackInSlot( 0 ) ) )
+			if( Api.INSTANCE.definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getInternalInventory().getStackInSlot( 0 ) ) )
 			{
 				final double xOff = 0.0;
 				final double yOff = 0.0;

src/main/java/appeng/block/paint/PaintBakedModel.java

@@ -188,7 +188,7 @@ class PaintBakedModel implements IBakedModel
 	@Override
 	public ItemOverrideList getOverrides()
 	{
-		return ItemOverrideList.NONE;
+		return ItemOverrideList.EMPTY;
 	}
 
 	static List<ResourceLocation> getRequiredTextures()

src/main/java/appeng/block/qnb/QnbFormedBakedModel.java

@@ -70,7 +70,7 @@ class QnbFormedBakedModel implements IBakedModel
 		this.coveredCableTexture = bakedTextureGetter.apply( TEXTURE_COVERED_CABLE );
 		this.lightTexture = bakedTextureGetter.apply( TEXTURE_RING_LIGHT );
 		this.lightCornerTexture = bakedTextureGetter.apply( TEXTURE_RING_LIGHT_CORNER );
-		this.linkBlock = AEApi.instance().definitions().blocks().quantumLink().maybeBlock().orElse( null );
+		this.linkBlock = Api.INSTANCE.definitions().blocks().quantumLink().maybeBlock().orElse( null );
 	}
 
 	@Override