Major Refactoring of Bootstrap Code (#75)

- Refactored boostrap code: * Completely reworked item/block/tile registration. * Fixed server side startup. * Fixed server side startup. * More documentation. * More heavy cleanup * More cleanups. * Major refactoring of state mapping and fixes a lot of other issue related to item rendering. * Fixes sky chest item models (no item TESR). * Only use CachingRotatingBakedModel for tile entities automatically. Fix default rotation of quartz pillar for item model. * Used method reference instead of lambda for ItemMeshDefinition for multiparts. * Removed unnecessary IHasSpecialItemModel * Removed unused IconReg class. * Updated resource pack version.
2016-08-22 14:25:10 +02:00
parent 66df324ef0
commit 6f2bbfab4c
172 changed files with 2289 additions and 2863 deletions
@@ -0,0 +1,99 @@
+package appeng.bootstrap;
+
+
+import java.util.function.BiFunction;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.statemap.IStateMapper;
+import net.minecraft.client.renderer.color.IBlockColor;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import appeng.block.AEBaseTileBlock;
+import appeng.bootstrap.components.BlockColorComponent;
+import appeng.bootstrap.components.StateMapperComponent;
+import appeng.bootstrap.components.TesrComponent;
+import appeng.client.render.model.CachingRotatingBakedModel;
+
+
+class BlockRendering implements IBlockRendering
+{
+
+	@SideOnly( Side.CLIENT )
+	private BiFunction<ModelResourceLocation, IBakedModel, IBakedModel> modelCustomizer;
+
+	@SideOnly( Side.CLIENT )
+	private IBlockColor blockColor;
+
+	@SideOnly( Side.CLIENT )
+	private TileEntitySpecialRenderer<?> tesr;
+
+	@SideOnly( Side.CLIENT )
+	private IStateMapper stateMapper;
+
+	@SideOnly( Side.CLIENT )
+	public IBlockRendering modelCustomizer( BiFunction<ModelResourceLocation, IBakedModel, IBakedModel> customizer )
+	{
+		modelCustomizer = customizer;
+		return this;
+	}
+
+	@SideOnly( Side.CLIENT )
+	@Override
+	public IBlockRendering blockColor( IBlockColor blockColor )
+	{
+		this.blockColor = blockColor;
+		return this;
+	}
+
+	@SideOnly( Side.CLIENT )
+	@Override
+	public IBlockRendering tesr( TileEntitySpecialRenderer<?> tesr )
+	{
+		this.tesr = tesr;
+		return this;
+	}
+
+	@SideOnly( Side.CLIENT )
+	@Override
+	public IBlockRendering stateMapper( IStateMapper mapper )
+	{
+		this.stateMapper = mapper;
+		return this;
+	}
+
+	void apply( FeatureFactory registry, Block block, Class<?> tileEntityClass )
+	{
+		if( tesr != null )
+		{
+			if( tileEntityClass == null )
+			{
+				throw new IllegalStateException( "Tried to register a TESR for " + block + " even though no tile entity has been specified." );
+			}
+			registry.addBootstrapComponent( new TesrComponent( tileEntityClass, tesr ) );
+		}
+
+		if( modelCustomizer != null )
+		{
+			registry.modelOverrideComponent.addOverride( block.getRegistryName().getResourcePath(), modelCustomizer );
+		}
+		else if ( block instanceof AEBaseTileBlock )
+		{
+			// This is a default rotating model if the base-block uses an AE tile entity which exposes UP/FRONT as extended props
+			registry.modelOverrideComponent.addOverride( block.getRegistryName().getResourcePath(), ( l, m ) -> new CachingRotatingBakedModel( m ) );
+		}
+
+		if( blockColor != null )
+		{
+			registry.addBootstrapComponent( new BlockColorComponent( block, blockColor ) );
+		}
+
+		if( stateMapper != null )
+		{
+			registry.addBootstrapComponent( new StateMapperComponent( block, stateMapper ) );
+		}
+	}
+}