diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 217bc02df..956080437 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -929,7 +929,7 @@ public class ClientProxy extends CommonProxy @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { - EnumDyeColor dyeColor = EnumDyeColor.byMetadata(stack.getItemDamage()&15); + EnumDyeColor dyeColor = EnumDyeColor.byDyeDamage(stack.getItemDamage()&15); EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()]; return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 1aa39c1cb..44f383567 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1036,7 +1036,7 @@ public class Mekanism public void registerOreDict() { //Add specific items to ore dictionary for recipe usage in other mods. -// OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0)); + OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0)); OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem()); OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust); OreDictionary.registerOre("dustWood", MekanismItems.Sawdust); @@ -1354,14 +1354,13 @@ public class Mekanism } } } - - //Load this module - addRecipes(); - addEntities(); //Integrate certain OreDictionary recipes registerOreDict(); + //Load this module + addRecipes(); + addEntities(); //Integrate with Waila FMLInterModComms.sendMessage("Waila", "register", "mekanism.common.integration.WailaDataProvider.register"); diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 5c36f41a9..7244f8837 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -49,7 +49,7 @@ public class BlockPlastic extends Block @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BlockStatePlastic.colorProperty, EnumDyeColor.byMetadata(meta)); + return getDefaultState().withProperty(BlockStatePlastic.colorProperty, EnumDyeColor.byDyeDamage(meta)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 9aa6e2973..a168c77bf 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -28,7 +28,7 @@ public class ItemBlockPlastic extends ItemBlock @Override public String getItemStackDisplayName(ItemStack stack) { - EnumDyeColor dyeColour = EnumDyeColor.byMetadata(stack.getItemDamage()&15); + EnumDyeColor dyeColour = EnumDyeColor.byDyeDamage(stack.getItemDamage()&15); EnumColor colour = EnumColor.DYES[dyeColour.getDyeDamage()]; String colourName; diff --git a/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java b/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java index c7f462393..d093f2092 100644 --- a/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java @@ -2,6 +2,7 @@ package mekanism.common.recipe; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import mekanism.common.Mekanism; import mekanism.common.util.RecipeUtils; @@ -110,9 +111,9 @@ public class ShapelessMekanismRecipe implements IRecipe { match = RecipeUtils.areItemsEqualForCrafting((ItemStack)next, slot); } - else if(next instanceof ArrayList) + else if(next instanceof List) { - Iterator itr = ((ArrayList)next).iterator(); + Iterator itr = ((List)next).iterator(); while(itr.hasNext() && !match) {