Addon transfer pt2

Fixed itemID conflict, Sounds not working, recipes work, Recipebook only displays addon trains (needs tweaking for when your addon uses its own modID)

src/main/java/tcce/client/core/handlers/RecipeBookHandler.java

@@ -5,18 +5,16 @@
 
 package tcce.client.core.handlers;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
 import net.minecraft.item.Item;
 import train.common.core.interfaces.ITCRecipe;
 import train.common.core.managers.TierRecipe;
+import train.common.library.Info;
+import train.common.library.TCCEItemIDs;
 import train.common.recipes.ShapedTrainRecipes;
 import train.common.recipes.ShapelessTrainRecipe;
 
+import java.util.*;
+
 public class RecipeBookHandler {
     public static String[] vanillaWorkTableRecipes = new String[21];
 
@@ -40,6 +38,9 @@ public static List<ITCRecipe> workbenchListCleaner(List recipeList) {
 
             ITCRecipe recipe = (ITCRecipe)r;
             String output = Item.itemRegistry.getNameForObject(recipe.getRecipeOutput().getItem());
+
+
+
             if (!outputs.contains(output)) {
                 if (!output.contains("tc:")) {
                     cleaned.add(recipe);
@@ -60,11 +61,16 @@ public static List<TierRecipe> assemblyListCleaner(List recipeList) {
                 TierRecipe recipe = (TierRecipe)r;
                 String output = Item.itemRegistry.getNameForObject(recipe.getOutput().getItem());
                 if (!outputs.contains(output)) {
-                    if (!output.contains("tc:")) {
-                        cleanedList.add(recipe);
-                        outputs.add(output);
+                    for (TCCEItemIDs items : TCCEItemIDs.values()) {
+                        if (output.equals(Info.modID + ":" + items.name())) {
+                            cleanedList.add(recipe);
+                            outputs.add(output);
+                        }
                     }
                 }
+
+
+
             }
         }
 

src/main/java/tcce/common/TCCE.java

@@ -12,15 +12,14 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import tcce.common.core.CommonProxy;
-import tcce.common.core.TCCETab;
 import tcce.common.core.handlers.EntityHandler;
 import tcce.common.core.handlers.TCCERecipeHandler;
 import tcce.common.items.TCCEItems;
 import tcce.common.library.TCCEInfo;
 import tcce.common.library.TCCERegistry;
 import tcce.common.recipes.AssemblyTableRecipes;
 
-@Mod(modid = TCCEInfo.modID, name = TCCEInfo.modName, version = TCCEInfo.modVersion)
+@Mod(modid = TCCEInfo.modID, name = TCCEInfo.modName, version = TCCEInfo.modVersion, dependencies = "required-after:tc")
 public class TCCE {
 
     /* TrainCraft instance */
@@ -55,17 +54,17 @@ public void preInit(FMLPreInitializationEvent event) {
         /* Register Items, Blocks, ... */
         tcLog.info("Initialize Blocks, Items, ...");
 
-        TCCETab = new TCCETab(CreativeTabs.getNextID(), "TCCE");
+        //TCCETab = new TCCETab(CreativeTabs.getNextID(), "TCCE");
+
 
 
-        TCCEItems.init();
         EntityHandler.init();
 
         /* Other Proxy init */
         tcLog.info("Initialize Renderer and Events");
 
         registry = new TCCERegistry();
-        registry.init();
+
 
         tcLog.info("Finished PreInitialization");
     }
@@ -74,13 +73,8 @@ public void preInit(FMLPreInitializationEvent event) {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-    }
-
-    @Mod.EventHandler
-    public void load(FMLInitializationEvent event) {
-
-
-
+        tcLog.info("Start Initialization");
+        TCCEItems.init();
         tcLog.info("Initialize Gui");
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
 
@@ -92,7 +86,13 @@ public void load(FMLInitializationEvent event) {
         AssemblyTableRecipes.recipes();
 
         proxy.registerBookHandler();
+        registry.init();
+        tcLog.info("Finished Initialization");
 
+    }
+
+    @Mod.EventHandler
+    public void load(FMLInitializationEvent event) {
 
     }
 

src/main/java/tcce/common/items/TCCEItems.java

@@ -8,9 +8,9 @@
 package tcce.common.items;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import tcce.common.TCCE;
+import tcce.common.library.TCCEInfo;
 import tcce.common.library.TCCEItemIDs;
-import train.common.items.ItemRollingStock;
+import train.common.Traincraft;
 
 public class TCCEItems {
 
@@ -20,28 +20,17 @@ public static void init() {
     }
 
     private static void loadItems() {
-        for (TCCEItemIDs items : TCCEItemIDs.values()) {
-            if (items.className != null) {
-                if (items.className.equals("ItemRollingStock")) {
-                    items.item = new ItemRollingStock("tc" + ":trains/" + items.iconName, TCCE.TCCETab);
-                }
-            }
-        }
 
-        TCCEItemIDs.recipeBook.item = new ItemRecipeBook();
+        TCCEItemIDs.recipeBook.item = new ItemRecipeBook().setCreativeTab(Traincraft.tcCommunityTab);
     }
 
     private static void registerItems() {
         for (TCCEItemIDs itemId : TCCEItemIDs.values()) {
             if (itemId.item != null) {
                 if (itemId.className != null) {
-                    if (itemId.className.equals("ItemRollingStock")) {
-                        itemId.item.setUnlocalizedName("tc:" + itemId.name());
-                        GameRegistry.registerItem(itemId.item, itemId.name(), "tc");
-                    }
-                    else {
-                        GameRegistry.registerItem(itemId.item, itemId.name());
-                    }
+                    GameRegistry.registerItem(itemId.item, itemId.name());
+                    itemId.item.setUnlocalizedName(TCCEInfo.modID + ":" + itemId.name());
+
                 }
 
 

src/main/java/tcce/common/library/TCCEEnumTrains.java

@@ -12,6 +12,7 @@
 import tcce.common.entity.rollingStock.steam.*;
 import tcce.common.entity.rollingStock.tender.*;
 import train.common.api.TrainRecord;
+import train.common.library.TCCEItemIDs;
 
 
 public class TCCEEnumTrains {