diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index b75db98ff..62769f827 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -82,8 +82,8 @@ public class MachineRecipes { return new ItemStack(ModItems.canister_napalm, 1); } - if (mODE(item, new String[] {"ingotRedstoneAlloy", "dustRedstoneAlloy"}) && mODE(item2, new String[] {"ingotSteel", "dustSteel"}) - || mODE(item, new String[] {"ingotSteel", "dustSteel"}) && mODE(item2, new String[] {"ingotRedstoneAlloy", "dustRedstoneAlloy"})) { + if (mODE(item, new String[] {"ingotRedCopperAlloy", "dustRedCopperAlloy"}) && mODE(item2, new String[] {"ingotSteel", "dustSteel"}) + || mODE(item, new String[] {"ingotSteel", "dustSteel"}) && mODE(item2, new String[] {"ingotRedCopperAlloy", "dustRedCopperAlloy"})) { return new ItemStack(ModItems.ingot_advanced_alloy, 2); } @@ -358,9 +358,9 @@ public class MachineRecipes { return new ItemStack(ModItems.wire_copper, 8); if(mODE(input, "ingotTungsten")) return new ItemStack(ModItems.wire_tungsten, 8); - if(mODE(input, "ingotRedAlloy")) + if(mODE(input, "ingotRedCopperAlloy")) return new ItemStack(ModItems.wire_red_copper, 8); - if(mODE(input, "ingotRedstoneAlloy")) + if(mODE(input, "ingotRedCopperAlloy")) return new ItemStack(ModItems.wire_red_copper, 8); if(mODE(input, "ingotGold")) return new ItemStack(ModItems.wire_gold, 8); diff --git a/src/main/java/com/hbm/packet/GunAnimationPacket.java b/src/main/java/com/hbm/packet/GunAnimationPacket.java index 525c0f6d6..e7b65abca 100644 --- a/src/main/java/com/hbm/packet/GunAnimationPacket.java +++ b/src/main/java/com/hbm/packet/GunAnimationPacket.java @@ -10,6 +10,8 @@ import com.hbm.render.anim.HbmAnimations.Animation; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -38,6 +40,7 @@ public class GunAnimationPacket implements IMessage { public static class Handler implements IMessageHandler { @Override + @SideOnly(Side.CLIENT) public IMessage onMessage(GunAnimationPacket m, MessageContext ctx) { try {