From 845d4da353ad1e3304339e81dbb6bd694fc612f6 Mon Sep 17 00:00:00 2001
From: shartte <sebastian@hartte.de>
Date: Tue, 16 Aug 2016 18:58:28 +0200
Subject: [PATCH] Implemented display of icons for MultiItem (#50)

* Implements rendering of MultiItem items.
---
 .../appeng/items/materials/MaterialType.java  | 22 ++++----------
 .../appeng/items/materials/MultiItem.java     | 30 +++++++++++++++----
 .../models/item/ItemMaterial.InvalidType.json |  3 ++
 3 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.InvalidType.json

diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java
index 5caa5694..c5119e07 100644
--- a/src/main/java/appeng/items/materials/MaterialType.java
+++ b/src/main/java/appeng/items/materials/MaterialType.java
@@ -21,13 +21,11 @@ package appeng.items.materials;
 
 import java.util.EnumSet;
 
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.core.AppEng;
 import appeng.core.features.AEFeature;
@@ -118,9 +116,7 @@ public enum MaterialType
 	CardCrafting( 53 );
 
 	private final EnumSet<AEFeature> features;
-	// TextureAtlasSprite for the material.
-	@SideOnly( Side.CLIENT )
-	private TextureAtlasSprite IIcon;
+	private final ModelResourceLocation model = new ModelResourceLocation( "appliedenergistics2:ItemMaterial." + name() );
 	private Item itemInstance;
 	private int damageValue;
 	// stack!
@@ -221,16 +217,6 @@ public enum MaterialType
 		this.itemInstance = itemInstance;
 	}
 
-	TextureAtlasSprite getIIcon()
-	{
-		return this.IIcon;
-	}
-
-	void setIIcon( final TextureAtlasSprite iIcon )
-	{
-		this.IIcon = iIcon;
-	}
-
 	MaterialStackSrc getStackSrc()
 	{
 		return this.stackSrc;
@@ -241,4 +227,8 @@ public enum MaterialType
 		this.stackSrc = stackSrc;
 	}
 
+	public ModelResourceLocation getModel() {
+		return model;
+	}
+
 }
diff --git a/src/main/java/appeng/items/materials/MultiItem.java b/src/main/java/appeng/items/materials/MultiItem.java
index a4729ba7..76e6f891 100644
--- a/src/main/java/appeng/items/materials/MultiItem.java
+++ b/src/main/java/appeng/items/materials/MultiItem.java
@@ -30,10 +30,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 
+import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
@@ -46,6 +48,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -61,7 +64,6 @@ import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.implementations.tiles.ISegmentedInventory;
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.SelectedPart;
-import appeng.client.ClientHelper;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.core.features.IStackSrc;
@@ -143,11 +145,8 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU
 
 	public MaterialType getTypeByStack( final ItemStack is )
 	{
-		if( this.dmgToMaterial.containsKey( is.getItemDamage() ) )
-		{
-			return this.dmgToMaterial.get( is.getItemDamage() );
-		}
-		return MaterialType.InvalidType;
+		MaterialType type = this.dmgToMaterial.get( is.getItemDamage() );
+		return (type != null) ? type : MaterialType.InvalidType;
 	}
 
 	@Override
@@ -446,4 +445,23 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU
 			return o1.compareTo( o2 );
 		}
 	}
+
+	@Override
+	@SideOnly( Side.CLIENT )
+	public List<ResourceLocation> getItemVariants()
+	{
+		// Register a resource location for every material type
+		return Arrays.stream( MaterialType.values() )
+				.map( MaterialType::getModel )
+				.collect( Collectors.toList() );
+
+	}
+
+	@Override
+	@SideOnly( Side.CLIENT )
+	public ItemMeshDefinition getItemMeshDefinition()
+	{
+		return is -> getTypeByStack( is ).getModel();
+	}
+
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.InvalidType.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.InvalidType.json
new file mode 100644
index 00000000..9bfa373a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.InvalidType.json
@@ -0,0 +1,3 @@
+{
+    "parent":"builtin/missing"
+}
\ No newline at end of file