Addon transfer pt2

It works, maybe requires some tweaking after testing

src/main/java/train/common/Traincraft.java

@@ -18,7 +18,7 @@
 import ebf.tim.entities.EntitySeat;
 import ebf.tim.networking.PacketSeatUpdate;
 import ebf.tim.utility.DebugUtil;
-import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor.ArmorMaterial;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
@@ -32,7 +32,6 @@
 import train.common.blocks.TCBlocks;
 import train.common.core.CommonProxy;
 import train.common.core.CreativeTabTraincraft;
-import train.common.core.CreativeTabTraincraftTrains;
 import train.common.core.TrainModCore;
 import train.common.core.handlers.*;
 import train.common.core.util.TraincraftUtil;
@@ -104,7 +103,7 @@ public class Traincraft {
     public static File configDirectory;
 
     /* Creative tab for Traincraft */
-    public static CreativeTabTraincraft tcTab, tcTrainTab;
+    public static CreativeTabTraincraft tcTab, tcTrainTab, tcCommunityTab ;
 
     public ArmorMaterial armor = EnumHelper.addArmorMaterial("Armor", 5, new int[]{1, 2, 2, 1}, 25);
     public ArmorMaterial armorCloth = EnumHelper.addArmorMaterial("TCcloth", 5, new int[]{1, 2, 2, 1}, 25);
@@ -145,6 +144,9 @@ public void preInit(FMLPreInitializationEvent event) {
                 e.printStackTrace();
             }
         }
+        if (hasTCCEAddon()){
+            tcCommunityTab = new CreativeTabTraincraft("Traincraft: Community Edition", Info.modID, "trains/train_mogul");
+        }
 
         /* Other Proxy init */
         tcLog.info("Initialize Renderer and Events");
@@ -159,6 +161,11 @@ public void init(FMLInitializationEvent event) {
         tcLog.info("Start Initialization");
         TCBlocks.init();
         TCItems.init();
+        if (Traincraft.hasTCCEAddon()) {
+            TCItems.registerTCCERollingStock();
+            Traincraft.tcLog.info("Enabled Traincraft: Community Edition rollingstock");
+        }
+
         proxy.registerTileEntities();
 
         tcLog.info("Initialize Fluids");
@@ -257,4 +264,6 @@ public static boolean hasNotEnoughItems() {
     public static boolean hasRailcraft() {
         return Loader.isModLoaded("Railcraft");
     }
+
+    public static boolean hasTCCEAddon() {return Loader.isModLoaded("tcce");}
 }

src/main/java/train/common/core/plugins/NEIAssemblyTableRecipePlugin.java

@@ -24,6 +24,7 @@
 
 public class NEIAssemblyTableRecipePlugin extends ShapedRecipeHandler {
 	private final List<TierRecipe> recipeList = assemblyListCleaner(TierRecipeManager.getInstance().getRecipeList());
+	private static TierRecipe currentRecipe;
 
 	private CachedShapedRecipe getShape(TierRecipe recipe) {
 		CachedShapedRecipe shape = new CachedShapedRecipe(0, 0, null, recipe.getOutput());
@@ -171,6 +172,7 @@ public void loadCraftingRecipes(ItemStack result) {
 		for (TierRecipe recipe : recipeList) {
 			if (NEIClientUtils.areStacksSameTypeCrafting(recipe.getOutput(), result)) {
 				this.arecipes.add(getShape(recipe));
+				currentRecipe = recipe;
 			}
 		}
 	}
@@ -209,8 +211,11 @@ public boolean hasOverlay(GuiContainer gui, Container container, int recipe) {
 	public void drawBackground(int recipe) {
 		GL11.glColor4f(1, 1, 1, 1);
 		TierRecipe tierRecipe = null;
+
+
+
 		if (recipe < recipeList.size()) {
-			tierRecipe = recipeList.get(recipe);
+			tierRecipe = currentRecipe;
 			if (tierRecipe != null) {
 				changeTexture(getGuiTexture(tierRecipe.getTier()));
 			}

src/main/java/train/common/items/TCItems.java

@@ -9,11 +9,10 @@
 
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.item.Item;
 import train.common.Traincraft;
 import train.common.adminbook.ItemAdminBook;
-import train.common.library.EnumTracks;
-import train.common.library.Info;
-import train.common.library.ItemIDs;
+import train.common.library.*;
 
 public class TCItems {
 
@@ -226,4 +225,25 @@ private static void registerItems() {
 			}
 		}
 	}
+
+
+	public static void registerTCCERollingStock(){
+
+		for (TCCEItemIDs tcceItems : TCCEItemIDs.values()) {
+			if (tcceItems.className != null) {
+				if (tcceItems.className.equals("ItemRollingStock")) {
+					tcceItems.item = new ItemRollingStock(Info.modID.toLowerCase() + ":trains/" + tcceItems.iconName, Traincraft.tcCommunityTab);
+				}
+
+			}
+		}
+
+		for (TCCEItemIDs tcceItems : TCCEItemIDs.values()) {
+			if (tcceItems.item != null){
+				tcceItems.item.setUnlocalizedName(Info.modID + ":" + tcceItems.name());
+				GameRegistry.registerItem(tcceItems.item, tcceItems.name());
+			}
+		}
+
+	}
 }