Added a color code to the memory card. (#3609)

Can be used to encode the stored content as a 4x2 grid of AEColors Currently used to indicate the P2P frequency.
2018-07-14 19:42:56 +02:00
parent 2891014cf6
commit fe4db2eb98
17 changed files with 462 additions and 77 deletions
@@ -28,7 +28,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.IModel;
 import net.minecraftforge.common.model.TRSRTransformation;

 import appeng.api.implementations.items.IBiometricCard;
@@ -216,9 +215,9 @@ class BiometricCardBakedModel implements IBakedModel
 	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
 	{
 		// Delegate to the base model if possible
-		if( this.baseModel instanceof IModel )
+		if( this.baseModel instanceof IBakedModel )
 		{
-			IBakedModel pam = (IBakedModel) this.baseModel;
+			IBakedModel pam = this.baseModel;
 			Pair<? extends IBakedModel, Matrix4f> pair = pam.handlePerspective( type );
 			return Pair.of( this, pair.getValue() );
 		}
@@ -0,0 +1,228 @@
+
+package appeng.client.render.model;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import javax.annotation.Nullable;
+import javax.vecmath.Matrix4f;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableList;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.block.model.ItemOverrideList;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+import net.minecraftforge.common.model.TRSRTransformation;
+
+import appeng.api.implementations.items.IMemoryCard;
+import appeng.api.util.AEColor;
+import appeng.client.render.cablebus.CubeBuilder;
+import appeng.core.AELog;
+
+
+class MemoryCardBakedModel implements IBakedModel
+{
+	private static final AEColor[] DEFAULT_COLOR_CODE = new AEColor[] {
+			AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT,
+			AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT,
+	};
+
+	private final VertexFormat format;
+
+	private final IBakedModel baseModel;
+
+	private final TextureAtlasSprite texture;
+
+	private final AEColor[] colorCode;
+
+	private final Cache<CacheKey, MemoryCardBakedModel> modelCache;
+
+	private final ImmutableList<BakedQuad> generalQuads;
+
+	MemoryCardBakedModel( VertexFormat format, IBakedModel baseModel, TextureAtlasSprite texture )
+	{
+		this( format, baseModel, texture, DEFAULT_COLOR_CODE, createCache() );
+	}
+
+	private MemoryCardBakedModel( VertexFormat format, IBakedModel baseModel, TextureAtlasSprite texture, AEColor[] hash, Cache<CacheKey, MemoryCardBakedModel> modelCache )
+	{
+		this.format = format;
+		this.baseModel = baseModel;
+		this.texture = texture;
+		this.colorCode = hash;
+		this.generalQuads = ImmutableList.copyOf( this.buildGeneralQuads() );
+		this.modelCache = modelCache;
+	}
+
+	private static Cache<CacheKey, MemoryCardBakedModel> createCache()
+	{
+		return CacheBuilder.newBuilder()
+				.maximumSize( 100 )
+				.build();
+	}
+
+	@Override
+	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
+	{
+
+		List<BakedQuad> quads = this.baseModel.getQuads( state, side, rand );
+
+		if( side != null )
+		{
+			return quads;
+		}
+
+		List<BakedQuad> result = new ArrayList<>( quads.size() + this.generalQuads.size() );
+		result.addAll( quads );
+		result.addAll( this.generalQuads );
+		return result;
+	}
+
+	private List<BakedQuad> buildGeneralQuads()
+	{
+		CubeBuilder builder = new CubeBuilder( this.format );
+
+		builder.setTexture( this.texture );
+
+		for( int x = 0; x < 4; x++ )
+		{
+			for( int y = 0; y < 2; y++ )
+			{
+				final AEColor color = this.colorCode[x + y * 4];
+
+				builder.setColorRGB( color.mediumVariant );
+				builder.addCube( 7 + x, 8 + ( 1 - y ), 7.5f, 7 + x + 1, 8 + ( 1 - y ) + 1, 8.5f );
+			}
+		}
+
+		return builder.getOutput();
+	}
+
+	@Override
+	public boolean isAmbientOcclusion()
+	{
+		return this.baseModel.isAmbientOcclusion();
+	}
+
+	@Override
+	public boolean isGui3d()
+	{
+		return this.baseModel.isGui3d();
+	}
+
+	@Override
+	public boolean isBuiltInRenderer()
+	{
+		return this.baseModel.isBuiltInRenderer();
+	}
+
+	@Override
+	public TextureAtlasSprite getParticleTexture()
+	{
+		return this.baseModel.getParticleTexture();
+	}
+
+	@Override
+	public ItemCameraTransforms getItemCameraTransforms()
+	{
+		return this.baseModel.getItemCameraTransforms();
+	}
+
+	@Override
+	public ItemOverrideList getOverrides()
+	{
+		return new ItemOverrideList( Collections.emptyList() )
+		{
+			@Override
+			public IBakedModel handleItemState( IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity )
+			{
+				try
+				{
+					if( stack.getItem() instanceof IMemoryCard )
+					{
+						final IMemoryCard memoryCard = (IMemoryCard) stack.getItem();
+						final AEColor[] colors = memoryCard.getColorCode( stack );
+
+						return MemoryCardBakedModel.this.modelCache.get( new CacheKey( colors ),
+								() -> new MemoryCardBakedModel( MemoryCardBakedModel.this.format, MemoryCardBakedModel.this.baseModel, MemoryCardBakedModel.this.texture, colors, MemoryCardBakedModel.this.modelCache ) );
+					}
+				}
+				catch( ExecutionException e )
+				{
+					AELog.error( e );
+				}
+
+				return MemoryCardBakedModel.this;
+			}
+		};
+
+	}
+
+	@Override
+	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
+	{
+		// Delegate to the base model if possible
+		if( this.baseModel instanceof IBakedModel )
+		{
+			IBakedModel pam = this.baseModel;
+			Pair<? extends IBakedModel, Matrix4f> pair = pam.handlePerspective( type );
+			return Pair.of( this, pair.getValue() );
+		}
+		return Pair.of( this, TRSRTransformation.identity().getMatrix() );
+	}
+
+	private static class CacheKey
+	{
+		private final AEColor[] key;
+
+		CacheKey( AEColor[] key )
+		{
+			this.key = key;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + Arrays.hashCode( this.key );
+			return result;
+		}
+
+		@Override
+		public boolean equals( Object obj )
+		{
+			if( this == obj )
+			{
+				return true;
+			}
+			if( obj == null )
+			{
+				return false;
+			}
+			if( this.getClass() != obj.getClass() )
+			{
+				return false;
+			}
+			CacheKey other = (CacheKey) obj;
+			return Arrays.equals( this.key, other.key );
+		}
+
+	}
+}
@@ -0,0 +1,70 @@
+
+package appeng.client.render.model;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.Function;
+
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.common.model.IModelState;
+import net.minecraftforge.common.model.TRSRTransformation;
+
+import appeng.core.AppEng;
+
+
+/**
+ * Model wrapper for the memory card item model, which combines a base card layer with a "visual hash" of the part/tile.
+ */
+public class MemoryCardModel implements IModel
+{
+
+	private static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "item/memory_card" );
+	private static final ResourceLocation TEXTURE = new ResourceLocation( AppEng.MOD_ID, "items/memory_card_hash" );
+
+	@Override
+	public Collection<ResourceLocation> getDependencies()
+	{
+		return Collections.singletonList( MODEL_BASE );
+	}
+
+	@Override
+	public Collection<ResourceLocation> getTextures()
+	{
+		return Collections.singletonList( TEXTURE );
+	}
+
+	@Override
+	public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
+	{
+		TextureAtlasSprite texture = bakedTextureGetter.apply( TEXTURE );
+
+		IBakedModel baseModel = this.getBaseModel( state, format, bakedTextureGetter );
+
+		return new MemoryCardBakedModel( format, baseModel, texture );
+	}
+
+	private IBakedModel getBaseModel( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
+	{
+		// Load the base model
+		try
+		{
+			return ModelLoaderRegistry.getModel( MODEL_BASE ).bake( state, format, bakedTextureGetter );
+		}
+		catch( Exception e )
+		{
+			throw new RuntimeException( e );
+		}
+	}
+
+	@Override
+	public IModelState getDefaultState()
+	{
+		return TRSRTransformation.identity().toItemTransform();
+	}
+}