Handle missing blocks

4 files changed, 34 insertions, 28 deletions

diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java
index 673e8c0c89..90d93b8f04 100644
--- a/src/main/java/kubatech/kubatech.java
+++ b/src/main/java/kubatech/kubatech.java
@@ -26,8 +26,6 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
-import cpw.mods.fml.common.event.FMLModIdMappingEvent;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -40,6 +38,7 @@ import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
@@ -48,9 +47,11 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import kubatech.api.enums.ItemList;
 import kubatech.api.helpers.ReflectionHelper;
+import kubatech.loaders.BlockLoader;
 import kubatech.network.CustomTileEntityPacket;
 import kubatech.network.LoadConfigPacket;
 
@@ -183,8 +184,13 @@ public class kubatech {
     }
 
     @Mod.EventHandler
-    public void mapping(FMLMissingMappingsEvent){
-
+    public void missingMappings(FMLMissingMappingsEvent event) {
+        for (FMLMissingMappingsEvent.MissingMapping missingMapping : event.getAll()) {
+            if (missingMapping.name.equals("EMT:EMT_GTBLOCK_CASEING")) {
+                if (missingMapping.type == GameRegistry.Type.BLOCK) missingMapping.remap(BlockLoader.defcCasingBlock);
+                else missingMapping.remap(Item.getItemFromBlock(BlockLoader.defcCasingBlock));
+            }
+        }
     }
 
     public static void debug(String message) {
diff --git a/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java b/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java
index ceb4055f8c..a41132279b 100644
--- a/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java
+++ b/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java
@@ -27,19 +27,19 @@ public class DEFCCasingBlock extends GT_Block_Casings_Abstract {
         this.setResistance(30.0F);
         this.setCreativeTab(KT);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Naquadah Alloy Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Bloody Ichorium Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Draconium Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Wyvern Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Awakened Draconium Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Chaotic Fusion Casing");
-
-        ItemList.DEFCCasingBase.set(new ItemStack(this, 1, 0));
-        ItemList.DEFCCasingT1.set(new ItemStack(this, 1, 1));
-        ItemList.DEFCCasingT2.set(new ItemStack(this, 1, 2));
-        ItemList.DEFCCasingT3.set(new ItemStack(this, 1, 3));
-        ItemList.DEFCCasingT4.set(new ItemStack(this, 1, 4));
-        ItemList.DEFCCasingT5.set(new ItemStack(this, 1, 5));
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Naquadah Alloy Fusion Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Bloody Ichorium Fusion Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Draconium Fusion Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Wyvern Fusion Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Awakened Draconium Fusion Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Chaotic Fusion Casing");
+
+        ItemList.DEFCCasingBase.set(new ItemStack(this, 1, 7));
+        ItemList.DEFCCasingT1.set(new ItemStack(this, 1, 8));
+        ItemList.DEFCCasingT2.set(new ItemStack(this, 1, 9));
+        ItemList.DEFCCasingT3.set(new ItemStack(this, 1, 10));
+        ItemList.DEFCCasingT4.set(new ItemStack(this, 1, 11));
+        ItemList.DEFCCasingT5.set(new ItemStack(this, 1, 12));
 
         // Taking one texture slot :P
         Textures.BlockIcons.setCasingTexture((byte) 1, (byte) (15 + 48), TextureFactory.of(this, 0));
@@ -48,7 +48,7 @@ public class DEFCCasingBlock extends GT_Block_Casings_Abstract {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int side, int meta) {
-        return texture[meta];
+        return texture[meta - 7];
     }
 
     @Override
diff --git a/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java b/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java
index 7e140006cd..669e3a6dc8 100644
--- a/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java
+++ b/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java
@@ -24,8 +24,8 @@ public class DEFCCasingItemBlock extends GT_Item_Casings_Abstract {
     @Override
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-        if (getDamage(aStack) > 0)
-            aList.add(StatCollector.translateToLocalFormatted("defc.casing.tip", getDamage(aStack)));
+        if (getDamage(aStack) > 7)
+            aList.add(StatCollector.translateToLocalFormatted("defc.casing.tip", getDamage(aStack) - 7));
         super.addInformation(aStack, aPlayer, aList, aF3_H);
     }
 
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java
index 696413ee55..3f6eea853e 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java
@@ -72,11 +72,11 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase<
     private static final List<Pair<Block, Integer>> fusionCasingTiers = Arrays
         .asList(Pair.of(GregTech_API.sBlockCasings4, 6), Pair.of(GregTech_API.sBlockCasings4, 8));
     private static final List<Pair<Block, Integer>> coreTiers = Arrays.asList(
-        Pair.of(BlockLoader.defcCasingBlock, 1),
-        Pair.of(BlockLoader.defcCasingBlock, 2),
-        Pair.of(BlockLoader.defcCasingBlock, 3),
-        Pair.of(BlockLoader.defcCasingBlock, 4),
-        Pair.of(BlockLoader.defcCasingBlock, 5));
+        Pair.of(BlockLoader.defcCasingBlock, 8),
+        Pair.of(BlockLoader.defcCasingBlock, 9),
+        Pair.of(BlockLoader.defcCasingBlock, 10),
+        Pair.of(BlockLoader.defcCasingBlock, 11),
+        Pair.of(BlockLoader.defcCasingBlock, 12));
     private static final IStructureDefinition<GT_MetaTileEntity_DEFusionCrafter> STRUCTURE_DEFINITION = StructureDefinition
         .<GT_MetaTileEntity_DEFusionCrafter>builder()
         .addShape(
@@ -97,19 +97,19 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase<
         .addElement(
             'N',
             ofChain(
-                onElementPass(e -> e.mCasing++, ofBlock(BlockLoader.defcCasingBlock, 0)),
+                onElementPass(e -> e.mCasing++, ofBlock(BlockLoader.defcCasingBlock, 7)),
                 ofHatchAdder(GT_MetaTileEntity_DEFusionCrafter::addEnergyInputToMachineList, CASING_INDEX, 1),
                 ofHatchAdder(GT_MetaTileEntity_DEFusionCrafter::addInputToMachineList, CASING_INDEX, 1),
                 ofHatchAdder(GT_MetaTileEntity_DEFusionCrafter::addOutputToMachineList, CASING_INDEX, 1),
                 ofHatchAdder(GT_MetaTileEntity_DEFusionCrafter::addMaintenanceToMachineList, CASING_INDEX, 1)))
-        .addElement('n', onElementPass(e -> e.mCasing++, ofBlock(BlockLoader.defcCasingBlock, 0)))
+        .addElement('n', onElementPass(e -> e.mCasing++, ofBlock(BlockLoader.defcCasingBlock, 7)))
         .addElement('f', ofBlock(GregTech_API.sBlockCasings4, 7))
         .addElement('F', ofBlocksTiered((Block b, int m) -> {
             if (b != GregTech_API.sBlockCasings4 || (m != 6 && m != 8)) return -2;
             return m == 6 ? 1 : 2;
         }, fusionCasingTiers, -1, (e, i) -> e.mFusionTierCasing = i, e -> e.mFusionTierCasing))
         .addElement('R', ofBlocksTiered((Block b, int m) -> {
-            if (b != BlockLoader.defcCasingBlock || m < 1 || m > 5) return -2;
+            if (b != BlockLoader.defcCasingBlock || m < 8 || m > 12) return -2;
             return m;
         }, coreTiers, -1, (e, i) -> e.mTierCasing = i, e -> e.mTierCasing))
         .build();